r1638: * dh_install: add missing parens to the $installed regexp. Closes: #227963version_4.1.85

   * dh_install: improve wording of --list-missing messages

1 files changed, 7 insertions, 3 deletions

diff --git a/dh_install b/dh_install
index e43229a5..45a1dfce 100755
--- a/dh_install
+++ b/dh_install
@@ -198,14 +198,18 @@ if ($dh{LIST_MISSING} || $dh{FAIL_MISSING}) {
 	
 	my @missing;
 	my $installed=join("|", @installed);
-	$installed=qr{^$installed$};
+	$installed=qr{^($installed)$};
 	find(sub {
 		-f || -l || return;
 		$_="$File::Find::dir/$_";
-		push @missing, $_ unless /$installed/ || excludefile($_);
+		if (! /$installed/ && ! excludefile($_)) {
+			my $file=$_;
+			$file=~s/^\Q$srcdir\E\///;
+			push @missing, $file;
+		}
 	}, $srcdir);
 	if (@missing) {
-		warning "$_ exists in debian/tmp but not installed to anywhere" foreach @missing;
+		warning "$_ exists in debian/tmp but is not installed to anywhere" foreach @missing;
 		if ($dh{FAIL_MISSING}) {
 			error("missing files, aborting");
 		}