Diagnostics: Make shellquote() print empty arguments as ''

[dgit.git] / Debian / Dgit.pm

diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index f166f11b58464b7d9616579fb3af89f4ef01a41d..f33b173ca9bdac1424757b1d7c3adb022bda57da 100644 (file)
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -17,7 +17,8 @@ BEGIN {
     @EXPORT      = qw(debiantag server_branch server_ref
                       stat_exists git_for_each_ref
                       $package_re $component_re $branchprefix
-                      initdebug enabledebug printdebug debugcmd
+                      initdebug enabledebug enabledebuglevel
+                      printdebug debugcmd
                       $debugprefix *debuglevel *DEBUG
                       shellquote printcmd);
     %EXPORT_TAGS = ( policyflags => [qw(NOFFCHECK FRESHREPO)] );
@@ -91,6 +92,12 @@ sub enabledebug () {
     $debuglevel ||= 1;
 }
     
+sub enabledebuglevel ($) {
+    die if $debuglevel;
+    ($debuglevel) = @_ + 0;
+    enabledebug();
+}
+    
 sub printdebug {
     print DEBUG $debugprefix, @_ or die $! if $debuglevel>0;
 }
@@ -100,7 +107,7 @@ sub shellquote {
     local $_;
     foreach my $a (@_) {
        $_ = $a;
-       if (m{[^-=_./0-9a-z]}i) {
+       if (!length || m{[^-=_./0-9a-z]}i) {
            s{['\\]}{'\\$&'}g;
            push @out, "'$_'";
        } else {