[debhelper-devel] [debhelper] 01/01: Fix dh_install's call to dh_missing

[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 7dd8f2c09a949c0318fd2b9ea5419f671c921088
Author: Niels Thykier <niels at thykier.net>
Date:   Sun May 7 19:18:08 2017 +0000

    Fix dh_install's call to dh_missing
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 debian/changelog | 4 ++++
 dh_install       | 3 ++-
 dh_missing       | 1 +
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 7d8008e..d8d9b5c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,10 @@ debhelper (10.4) UNRELEASED; urgency=medium
   [ Niels Thykier ]
   * meson.pm: Pass --wrap-mode=nodownload to meson (requires meson
     0.40-1 or later).
+  * dh_install: Fix initialized warning when --sourcedir is absent
+    on the cmd-line.
+  * dh_missing: Accept --sourcedir (given it is passed by dh_install).
+    (Closes: #862049)
 
   [ Chris Lamb ]
   * dh_fixperms: Fix regression where dh_fixperms would fail to correct
diff --git a/dh_install b/dh_install
index d78f5b6..820ac70 100755
--- a/dh_install
+++ b/dh_install
@@ -270,7 +270,8 @@ if ($missing_files) {
 }
 
 if ($dh{LIST_MISSING} || $dh{FAIL_MISSING}) {
-	my @options = ('--sourcedir', $dh{SOURCEDIR});
+	my @options;
+	push(@options, '--sourcedir', $dh{SOURCEDIR}) if defined($dh{SOURCEDIR});
 	push @options, "--list-missing" if $dh{LIST_MISSING};
 	push @options, "--fail-missing" if $dh{FAIL_MISSING};
 	my $ret = system("dh_missing", @options);
diff --git a/dh_missing b/dh_missing
index b576991..5218e3d 100755
--- a/dh_missing
+++ b/dh_missing
@@ -71,6 +71,7 @@ not only list the missing files, but also fail with a nonzero exit code.
 init(options => {
 	"list-missing" => \$dh{LIST_MISSING},
 	"fail-missing" => \$dh{FAIL_MISSING},
+	"sourcedir=s" => \$dh{SOURCEDIR},
 });
 
 my (@installed, %helpers);

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