From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 25 Oct 2013 15:55:05 +0000 (+0100)
Subject: Fix the "shellquote" command to work properly.  The bugs in it ought not to have... 
X-Git-Tag: debian/0.17_experimental4~7
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=08b5daae7971c7ab730471d58d665ef087573791;p=dgit.git

Fix the "shellquote" command to work properly.  The bugs in it ought not to have caused any real trouble in previous versions of dgit.
---

diff --git a/debian/changelog b/debian/changelog
index ad200880..41374bb0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ dgit (0.17~experimental4) experimental; urgency=low
     order so that we use the correct Description (the _source one,
     not the one from sbuild which didn't get e.g. -v<version>).
   * Clarify the manpage's comments about orig tarballs.  Closes: #723605.
+  * Fix the "shellquote" command to work properly.  The bugs in it ought
+    not to have caused any real trouble in previous versions of dgit.
 
  --
 
diff --git a/dgit b/dgit
index 254e3fbf..d74dd85b 100755
--- a/dgit
+++ b/dgit
@@ -312,7 +312,8 @@ sub shellquote {
     local $_;
     foreach my $a (@_) {
 	$_ = $a;
-	if (s{['\\]}{\\$&}g || m{\s} || m{[^-_./0-9a-z]}i) {
+	if (m{[^-=_./0-9a-z]}i) {
+	    s{['\\]}{'\\$&'}g;
 	    push @out, "'$_'";
 	} else {
 	    push @out, $_;