[devscripts] 01/02: debsign: Set ext to empty string when a child file isn't found

[James McCoy]

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

jamessan pushed a commit to branch master
in repository devscripts.

commit 6ab795cefff79aae546fe13701d81265f6fac1a2
Author: James McCoy <jamessan at debian.org>
Date:   Thu Mar 16 22:28:25 2017 -0400

    debsign: Set ext to empty string when a child file isn't found
    
    This ensures the -n checks, which determine whether to process the file,
    correctly fail so we don't try to sign non-existent files.
    
    Signed-off-by: James McCoy <jamessan at debian.org>
---
 debian/changelog   | 8 ++++++++
 scripts/debsign.sh | 9 +++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9f9a1c1..7fe3f63 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+devscripts (2.17.4) UNRELEASED; urgency=medium
+
+  * debsign:
+    + Don't try to sign a buildinfo file when one isn't listed in the
+      changes/dsc.  (Closes: #857964)
+
+ -- James McCoy <jamessan at debian.org>  Thu, 16 Mar 2017 22:13:35 -0400
+
 devscripts (2.17.3) unstable; urgency=medium
 
   * debsign:
diff --git a/scripts/debsign.sh b/scripts/debsign.sh
index 3f84b63..0717bea 100755
--- a/scripts/debsign.sh
+++ b/scripts/debsign.sh
@@ -739,8 +739,13 @@ derive_childfile() {
 
     local fname dir
     fname="$(sed -n '/^\(Checksum\|Files\)/,/^\(Checksum\|Files\)/s/.*[ 	]\([^ ]*\.'"$ext"'\)$/\1/p' "$base" | head -n1)"
-    get_dirname "$base" dir
-    eval "$ext=\"${dir}$fname\""
+    if [ -n "$fname" ]
+    then
+	get_dirname "$base" dir
+	eval "$ext=\"${dir}$fname\""
+    else
+	eval "$ext="
+    fi
 }
 
 get_dirname() {

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