[debhelper-devel] [debhelper] 01/03: dh_usrlocal: Fix doit-bug that forks a shell

[Niels Thykier]

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

nthykier pushed a commit to branch shell-out-less
in repository debhelper.

commit b2ae22dd943871e07c8bfd6d420097356fa80179
Author: Niels Thykier <niels at thykier.net>
Date:   Sat Jul 15 09:10:39 2017 +0000

    dh_usrlocal: Fix doit-bug that forks a shell
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 debian/changelog | 6 ++++++
 dh_usrlocal      | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index df45066..b381c5e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+debhelper (10.7) UNRELEASED; urgency=medium
+
+  * dh_usrlocal: Fix call to doit to avoid making it fork a shell.
+
+ -- Niels Thykier <niels at thykier.net>  Sat, 15 Jul 2017 09:42:32 +0000
+
 debhelper (10.6.4) unstable; urgency=medium
 
   * dh_installmenu: Revert "Stop installing menu files in compat 11
diff --git a/dh_usrlocal b/dh_usrlocal
index 86f2bd9..9707f23 100755
--- a/dh_usrlocal
+++ b/dh_usrlocal
@@ -91,13 +91,13 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 				unshift @dirs, "$fn $mode $user $group";
 				# ...whereas @justdirs is depth-first for removal.
 				push @justdirs, $fn;
-				doit("rmdir $_");
+				doit('rmdir', $_);
 			}
 			else {
 				warning("$fn is not a directory");
 			}
 		      }}, "$tmp/usr/local");
-		doit("rmdir $tmp/usr/local");
+		doit('rmdir', "$tmp/usr/local");
 	
 		my $bs = "\\";     # A single plain backslash
 		my $ebs = $bs x 2; # Escape the backslash from the shell

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