[pbuilder] 01/02: buildpackage: revert c23f462, to avoid spawing another process just for this

[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 c45f8acd8be7ebc42defce8d72fde29c42db3a43
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Sun Feb 5 16:27:47 2017 +0100

    buildpackage: revert c23f462, to avoid spawing another process just for this
    
    Gbp-Dch: Ignore
---
 pbuilder-buildpackage | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pbuilder-buildpackage b/pbuilder-buildpackage
index 37bb288..81f39e6 100755
--- a/pbuilder-buildpackage
+++ b/pbuilder-buildpackage
@@ -128,7 +128,11 @@ log.i "Copying source file"
 copydsc "$PACKAGENAME" "${BUILDPLACE}$BUILDDIR"
 copyinputfile "${BUILDPLACE}$BUILDDIR"
 
-BUILDSUBDIR="${BUILDSUBDIR:-"$(dsc_get_basename "$PACKAGENAME" "no" | tr '_' '-')"}"
+# don't allow empty values of BUILDSUBDIR
+if [ -z "${BUILDSUBDIR:-}" ]
+    BUILDSUBDIR="$(dsc_get_basename "$PACKAGENAME" "no")"
+    BUILDSUBDIR="${BUILDSUBDIR//_/-/}"
+fi
 
 log.i "Extracting source"
 if echo "chown $BUILDUSERNAME:$BUILDUSERNAME $BUILDDIR $BUILDDIR/*" | $CHROOTEXEC /bin/bash; then

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