[pbuilder] 03/03: pbuilder-buildpackage-funcs: Only look in BUILDSUBDIR

[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 4a1c55b80213e9da313413ca895f2614b907a76b
Author: James Clarke <jrtc27 at debian.org>
Date:   Wed Mar 1 16:21:08 2017 +0000

    pbuilder-buildpackage-funcs: Only look in BUILDSUBDIR
---
 pbuilder-buildpackage-funcs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pbuilder-buildpackage-funcs b/pbuilder-buildpackage-funcs
index 0d9c15d..1456532 100644
--- a/pbuilder-buildpackage-funcs
+++ b/pbuilder-buildpackage-funcs
@@ -220,7 +220,7 @@ function binNMU() {
     local arch=$($CHROOTEXEC dpkg-architecture -qDEB_HOST_ARCH)
     local date=$(date -R ${BINNMU_TIMESTAMP:+-d "${BINNMU_TIMESTAMP}"})
     log.i "Doing a binNMU, version $BINNMU_VERSION for $DISTRIBUTION/$arch to '$BINNMU_MESSAGE'"
-    local cl=$(ls "$BUILDPLACE"/"$BUILDDIR"/*/debian/changelog)
+    local cl=$(ls "$BUILDPLACE"/"$BUILDDIR"/"$BUILDSUBDIR"/debian/changelog)
     local tmpcl=$(mktemp pbuilder.tmpchangelog.XXXXXXXXXXX)
     if [ ! -f "$cl" ]; then
         log.e "Cannot open debian/changelog for binNMU version handling."
@@ -284,7 +284,7 @@ cross_build_setup () {
 
 function _find_additional_buildresults() {
     local file f
-    local root="${BUILDPLACE}${BUILDDIR}/*"
+    local root="${BUILDPLACE}${BUILDDIR}/${BUILDSUBDIR}"
     for file in "${ADDITIONAL_BUILDRESULTS[@]}"; do
         log.d "checking [$file]..."
         echo "$root/$file" | perl -ne 'print "$_\n" foreach glob($_)' | \

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