[debhelper-devel] [debhelper] 02/02: Dh_Lib: When passing -a/-i only, and there are no arch/indep packages, exit

Niels Thykier nthykier at moszumanska.debian.org
Sun Jun 4 12:07:08 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 762765c8daf7810ed8e7247ed6df6c8cb58210ae
Author: Iain Lane <laney at debian.org>
Date:   Fri Jun 2 11:40:47 2017 +0100

    Dh_Lib: When passing -a/-i only, and there are no arch/indep packages, exit
    
    This was accidentally removed when optimising a common case.
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 Debian/Debhelper/Dh_Lib.pm | 7 +++++++
 debian/changelog           | 5 +++++
 2 files changed, 12 insertions(+)

diff --git a/Debian/Debhelper/Dh_Lib.pm b/Debian/Debhelper/Dh_Lib.pm
index fb5752d..1f6d6e8 100644
--- a/Debian/Debhelper/Dh_Lib.pm
+++ b/Debian/Debhelper/Dh_Lib.pm
@@ -73,6 +73,13 @@ sub init {
 			push(@{$dh{DOPACKAGES}}, getpackages('arch'));
 			$dh{DOARCH} = 1;
 		}
+
+		if (! @{$dh{DOPACKAGES}}) {
+			if (! $dh{BLOCK_NOOP_WARNINGS}) {
+				warning("You asked that all arch in(dep) packages be built, but there are none of that type.");
+			}
+			exit(0);
+		}
 		# Clear @ARGV so we do not hit the expensive case below
 		@ARGV = ();
 	}
diff --git a/debian/changelog b/debian/changelog
index dae3183..2f39625 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 debhelper (10.5) UNRELEASED; urgency=medium
 
+  [ Niels Thykier ]
   * dh_installman: Remove unncessary "chown" call that made things a
     lot slower.  Thanks to Kurt Roeckx for reporting it.
   * dh_installman: Fix wrong permission of man pages (set 0755 instead
@@ -7,6 +8,10 @@ debhelper (10.5) UNRELEASED; urgency=medium
   * dh_installman: Batch chmod calls to reduce the overhead for
     packages with many manpages.
 
+  [ Iain Lane ]
+  * Dh_Lib: Re-add warning + exit 0 for the -i/-a shortcut that was
+    added in 10.3.  (Closes: #863961)
+
  -- Niels Thykier <niels at thykier.net>  Sun, 04 Jun 2017 11:09:56 +0000
 
 debhelper (10.4) experimental; urgency=medium

-- 
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