[pbuilder] 03/06: buildpackage: rename internal variable SUBDIR_NAME in BUILDSUBDIR

[Mattia Rizzolo]

This is an automated email from the git hooks/post-receive script.

mattia pushed a commit to branch master
in repository pbuilder.

commit 33e66761cc54b68b24ba50d902d4e0c8d19eb9fb
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Sun Feb 5 15:57:00 2017 +0100

    buildpackage: rename internal variable SUBDIR_NAME in BUILDSUBDIR
---
 pbuilder-buildpackage | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pbuilder-buildpackage b/pbuilder-buildpackage
index 68435c6..004b2f8 100755
--- a/pbuilder-buildpackage
+++ b/pbuilder-buildpackage
@@ -128,7 +128,7 @@ log.i "Copying source file"
 copydsc "$PACKAGENAME" "${BUILDPLACE}$BUILDDIR"
 copyinputfile "${BUILDPLACE}$BUILDDIR"
 
-SUBDIR_NAME="$(dsc_get_basename "$PACKAGENAME" "no" | tr '_' '-')"
+BUILDSUBDIR="$(dsc_get_basename "$PACKAGENAME" "no" | tr '_' '-')"
 
 log.i "Extracting source"
 if echo "chown $BUILDUSERNAME:$BUILDUSERNAME $BUILDDIR $BUILDDIR/*" | $CHROOTEXEC /bin/bash; then
@@ -137,7 +137,7 @@ else
     log.e "pbuilder: Failed chowning to $BUILDUSERNAME:$BUILDUSERNAME"
     exit 1;
 fi
-if echo "( cd $BUILDDIR; env PATH=\"$PATH\" dpkg-source -x $(basename "$PACKAGENAME") "$SUBDIR_NAME" )" | $UNSHARE $CHROOTEXEC env $SUTOUSER ; then
+if echo "( cd $BUILDDIR; env PATH=\"$PATH\" dpkg-source -x $(basename "$PACKAGENAME") "$BUILDSUBDIR" )" | $UNSHARE $CHROOTEXEC env $SUTOUSER ; then
     : # success
 else
     log.e "pbuilder: Failed extracting the source"
@@ -180,7 +180,7 @@ fi
     if [ -n "$TWICE" ]; then
         DPKG_COMMANDLINE="$DPKG_COMMANDLINE && $DPKG_COMMANDLINE"
     fi
-    DPKG_COMMANDLINE="cd ${BUILDDIR}/$SUBDIR_NAME/ && $DPKG_COMMANDLINE"
+    DPKG_COMMANDLINE="cd ${BUILDDIR}/$BUILDSUBDIR/ && $DPKG_COMMANDLINE"
     log.i "Running $DPKG_COMMANDLINE"
     echo "$DPKG_COMMANDLINE" | $UNSHARE $CHROOTEXEC env $SUTOUSER
 ) &

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pbuilder/pbuilder.git