[debhelper-devel] [debhelper] 01/02: Dh_Lib: Fix inverted boolean logic

Niels Thykier nthykier at moszumanska.debian.org
Tue Aug 1 16:55:05 UTC 2017


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

nthykier pushed a commit to branch master
in repository debhelper.

commit e39de1101befe1545dc4dab3d2b375e949b3ae2a
Author: Niels Thykier <niels at thykier.net>
Date:   Tue Aug 1 16:51:51 2017 +0000

    Dh_Lib: Fix inverted boolean logic
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 Debian/Debhelper/Dh_Lib.pm | 2 +-
 debian/changelog           | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/Debian/Debhelper/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm
index 60a5422..e11aa6f 100644
--- a/Debian/Debhelper/Dh_Lib.pm
+++ b/Debian/Debhelper/Dh_Lib.pm
@@ -311,7 +311,7 @@ sub _doit {
 	my $options = ref($cmd[0]) ? shift(@cmd) : undef;
 	# In compat <= 10, we warn, compat 11 we detect and error, in
 	# compat 12 we assume peolpe know what they are doing.
-	if (not defined($options) and @cmd == 1 and not compat(11) and $cmd[0] =~ m/[\s<&>|;]/) {
+	if (not defined($options) and @cmd == 1 and compat(11) and $cmd[0] =~ m/[\s<&>|;]/) {
 		deprecated_functionality('doit() + doit_*() calls will no longer spawn a shell in compat 11 for single string arguments (please use complex_doit instead)',
 								 11);
 		return 1 if $dh{NO_ACT};
diff --git a/debian/changelog b/debian/changelog
index 63ac478..e93a5b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+debhelper (10.7.2) UNRELEASED; urgency=medium
+
+  * Dh_Lib: Fix inverted boolean logic that causes a
+    compatibility rule to be ignored.  Thanks to Adrian Bunk,
+    Andreas Beckmann, Markus Koschany and Emmanuel Bourg for
+    reporting and analysing the issue.  (Closes: #870339)
+
+ -- Niels Thykier <niels at thykier.net>  Tue, 01 Aug 2017 16:47:31 +0000
+
 debhelper (10.7.1) unstable; urgency=medium
 
   * Dh_Lib: Fix doit's new call to ensure it does not call a shell

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




More information about the debhelper-devel mailing list