[debhelper-devel] [debhelper] 01/01: dh_missing: Permit missing d/tmp when implicit

[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 e38c2459c201759a78b7471a21344d674b2d02bf
Author: Niels Thykier <niels at thykier.net>
Date:   Sun Nov 19 06:51:53 2017 +0000

    dh_missing: Permit missing d/tmp when implicit
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 debian/changelog | 6 ++++++
 dh_missing       | 5 ++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 4bd70c7..7a769f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,12 @@ debhelper (10.10.9) UNRELEASED; urgency=medium
     Now output of ‘qmake -query’ with and without using this file is
     identical. This makes cross-building Qt’s own modules possible.
 
+  [ Niels Thykier ]
+  * dh_missing: Permit a missing debian/tmp without failing in
+    compat 11 when debian/tmp is an implicit source directory.
+    Thanks to Christoph Biedl for reporting the bug.
+    (Closes: #882083)
+
  -- Niels Thykier <niels at thykier.net>  Thu, 16 Nov 2017 18:36:51 +0000
 
 debhelper (10.10.8) unstable; urgency=medium
diff --git a/dh_missing b/dh_missing
index 1865806..c58adec 100755
--- a/dh_missing
+++ b/dh_missing
@@ -95,8 +95,11 @@ if (! -d $srcdir) {
 		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.
+		# Prevent "dh $@ --list-missing --destdir=... ..." from failing in compat 10.
 		warning("Cannot check if installation is missing files: $srcdir does not exist");
 		exit(0);
 	} else {

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