summaryrefslogtreecommitdiff
path: root/dh_install
diff options
context:
space:
mode:
authorjoey <joey>2004-01-16 03:43:41 +0000
committerjoey <joey>2004-01-16 03:43:41 +0000
commit118269e577000827f09268d54db87a453abbc176 (patch)
tree7d49033bee6bb5dd6006ce77ca3508459a0d6484 /dh_install
parentba7461c6cb0a727954e8c5adecfa9b7d8eab854f (diff)
r1638: * dh_install: add missing parens to the $installed regexp. Closes: #227963
* dh_install: improve wording of --list-missing messages
Diffstat (limited to 'dh_install')
-rwxr-xr-xdh_install10
1 files changed, 7 insertions, 3 deletions
diff --git a/dh_install b/dh_install
index e43229a..45a1dfc 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");
}