[pbuilder] 02/03: pbuilder-buildpackage: Look for the correct changes file when performing a binNMU

[James Clarke]

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

jrtc27 pushed a commit to branch wip/binnmu
in repository pbuilder.

commit 12db003ddd7e12ca6b28cf68ca8df6c0db1e20c9
Author: James Clarke <jrtc27 at debian.org>
Date:   Wed Mar 1 16:15:24 2017 +0000

    pbuilder-buildpackage: Look for the correct changes file when performing a binNMU
    
    Closes: #856475
---
 pbuilder-buildpackage       | 5 +++--
 pbuilder-buildpackage-funcs | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pbuilder-buildpackage b/pbuilder-buildpackage
index 14b155a..6781309 100755
--- a/pbuilder-buildpackage
+++ b/pbuilder-buildpackage
@@ -155,14 +155,15 @@ checkbuilddep "$PACKAGENAME"
 save_aptcache
 trap umountproc_cleanbuildplace_trap exit sighup sigpipe
 
+# This potentially gets modified by binNMU so must come first
+CHANGES_BASENAME=$(dsc_get_basename "$PACKAGENAME" "yes")
+
 binNMU
 
 log.i "Building the package"
 
 executehooks "A"
 
-CHANGES_BASENAME=$(dsc_get_basename "$PACKAGENAME" "yes")
-
 ENV_PREFIX="env PATH=\"$PATH\" HOME=\"$BUILD_HOME\""
 DPKG_COMMANDLINE="$ENV_PREFIX dpkg-buildpackage -us -uc $DEBBUILDOPTS"
 
diff --git a/pbuilder-buildpackage-funcs b/pbuilder-buildpackage-funcs
index e771084..0d9c15d 100644
--- a/pbuilder-buildpackage-funcs
+++ b/pbuilder-buildpackage-funcs
@@ -237,6 +237,7 @@ function binNMU() {
         log.w "No distribution provided, using the field from the last upload"
         DISTRIBUTION=$(dpkg-parsechangelog -l "$tmpcl" -c 1 --show-field Distribution)
     fi
+    CHANGES_BASENAME="$CHANGES_BASENAME+b$BINNMU_VERSION"
     DEBBUILDOPTS="${DEBBUILDOPTS} -e\"$BINNMU_MAINTAINER\" -m\"$BINNMU_MAINTAINER\""
     cat > "$cl" << EOF
 $package ($version+b$BINNMU_VERSION) $DISTRIBUTION; urgency=low, binary-only=yes

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