[debhelper-devel] [debhelper] 01/01: dh: Always run commands with sequence defined options

[Niels Thykier]

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

nthykier pushed a commit to branch master
in repository debhelper.

commit 2a8d9efcca626d2027c093f11cd10c6909c81338
Author: Niels Thykier <niels at thykier.net>
Date:   Sat Jan 20 09:38:35 2018 +0000

    dh: Always run commands with sequence defined options
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 debian/changelog | 3 +++
 dh               | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 4ef1247..36da02a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,9 @@ debhelper (11.1.3) UNRELEASED; urgency=medium
   * ninja.pm: Set LC_ALL=C.UTF-8 when calling ninja to avoid
     meson choking on UTF-8 characters when it embeds itself into
     e.g. the build or install.  (Closes: #873831)
+  * dh: Remove the assumption that sequences will supply only
+    "safe no-op" parameters to commands.  Thanks to Axel Beckert
+    and Sascha Steinbiss for the report.  (Closes: #887727)
 
  -- Niels Thykier <niels at thykier.net>  Sun, 14 Jan 2018 09:54:57 +0000
 
diff --git a/dh b/dh
index 4716031..787462a 100755
--- a/dh
+++ b/dh
@@ -998,6 +998,9 @@ sub can_skip {
 	return 0 if $user_specified_options ||
 		(exists $ENV{DH_OPTIONS} && length $ENV{DH_OPTIONS});
 
+	return 0 if exists($command_opts{$command})
+		and @{$command_opts{$command}};
+
 	if (! defined $skipinfo{$command}) {
 		$skipinfo{$command}=[extract_skipinfo($command)];
 	}

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