[debhelper-devel] [debhelper] 02/17: dh_install: Uninstalled files should still fail

[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 597a12e338beccc3d6a1be1f8c9c007d1a113564
Author: Niels Thykier <niels at thykier.net>
Date:   Mon Apr 3 09:14:03 2017 +0000

    dh_install: Uninstalled files should still fail
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 dh_install | 5 +++++
 dh_missing | 6 ------
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/dh_install b/dh_install
index 23783e1..eb10586 100755
--- a/dh_install
+++ b/dh_install
@@ -256,6 +256,11 @@ foreach my $package (getpackages()) {
 	log_installed_files('dh_install', $package, @installed);
 }
 
+if ($missing_files) {
+	# There were files we could not install (e.g. patterns that matched nothing)
+	error("missing files, aborting");
+}
+
 my @options;
 push @options, "--list-missing" if $dh{LIST_MISSING};
 push @options, "--fail-missing" if $dh{FAIL_MISSING};
diff --git a/dh_missing b/dh_missing
index 2808f7b..b3c7848 100755
--- a/dh_missing
+++ b/dh_missing
@@ -72,8 +72,6 @@ my @installed;
 my $srcdir = '.';
 $srcdir = $dh{SOURCEDIR} if defined $dh{SOURCEDIR};
 
-my $missing_files = 0;
-
 if (!$dh{LIST_MISSING} && !$dh{FAIL_MISSING}) {
 	exit 0;
 }
@@ -125,10 +123,6 @@ if (@missing) {
 	}
 }
 
-if ($missing_files) {
-	error("missing files, aborting");
-}
-
 =head1 SEE ALSO
 
 L<debhelper(7)>

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