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

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

diff --git a/dh_install b/dh_install
index e43229a5cf20413838d71a151fe9681357238010..45a1dfceb33987f675ab35bc4b892f0f6f9da91f 100755 (executable)
--- 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");
                }