[debhelper-devel] [debhelper] 01/01: dh_missing: Tweak single binary handling

[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 3cb2e268bcc90616db00e983628bd18032e87576
Author: Niels Thykier <niels at thykier.net>
Date:   Sat Dec 30 18:08:50 2017 +0000

    dh_missing: Tweak single binary handling
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 debian/changelog | 2 ++
 dh_missing       | 9 +++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 11eea1d..2500c16 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ debhelper (11.1) UNRELEASED; urgency=medium
   [ Niels Thykier ]
   * dh_missing: Support wildcards in debian/not-installed.  Thanks
     to Maximiliano Curia for the suggestion.  (Closes: #884556)
+  * dh_missing: Tweak handling of missing source directory and
+    single binary packages.
 
  -- Niels Thykier <niels at thykier.net>  Sun, 17 Dec 2017 07:59:18 +0000
 
diff --git a/dh_missing b/dh_missing
index d6eb0dc..5d5c0f9 100755
--- a/dh_missing
+++ b/dh_missing
@@ -90,14 +90,15 @@ if ($srcdir eq '.') {
 }
 
 if (! -d $srcdir) {
-	if (scalar(getpackages()) == 1 && not defined($dh{SOURCEDIR})) {
+	# If there was no explicit source directory, then we do not care
+	# if it is missing.
+	exit(0) if not defined $dh{SOURCEDIR};
+
+	if (scalar(getpackages()) == 1 && defined($dh{SOURCEDIR})) {
 		warning("$srcdir does not exist and there is only binary package.");
 		warning("Assuming everything is installed directly into the package directory.");
 		exit(0);
 	}
-	# If there was no explicit source directory, then we do not care
-	# if it is missing.
-	exit(0) if not defined $dh{SOURCEDIR};
 	if (compat(10)) {
 		# Prevent "dh $@ --list-missing --destdir=... ..." from failing in compat 10.
 		warning("Cannot check if installation is missing files: $srcdir does not exist");

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