diff options
| author | Guillem Jover <guillem@debian.org> | 2019-11-03 01:34:29 +0100 |
|---|---|---|
| committer | Guillem Jover <guillem@debian.org> | 2019-11-26 02:42:44 +0100 |
| commit | 79d01b9283bb8c5c9867a9601a4b3011f207684f (patch) | |
| tree | b9faeec91d5718639bdb1bc004df27de0333604f | |
| parent | 7100870cbd2e90f994f3e812bd12e85b814a1af5 (diff) | |
| download | dpkg-79d01b9283bb8c5c9867a9601a4b3011f207684f.tar.gz | |
Dpkg::Vendor::Debian: Only scan /usr/local/ directories that exist
Closes: #932967
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | scripts/Dpkg/Vendor/Debian.pm | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index f6f70357e..f9698ef17 100644 --- a/debian/changelog +++ b/debian/changelog @@ -40,6 +40,8 @@ dpkg (1.20.0) UNRELEASED; urgency=medium Requested by Daniel Schepler <dschepler@gmail.com>. - Dpkg::Source::Package::V2: Emit a special patch header on single-debian-patch. Closes: #933152 + - Dpkg::Vendor::Debian: Only scan /usr/local/ directories that exist. + Closes: #932967 * Documentation: - man: Fix uncommon wording constructs. - man: Use a minus sign for a literal string. diff --git a/scripts/Dpkg/Vendor/Debian.pm b/scripts/Dpkg/Vendor/Debian.pm index a352bbdde..65c7f2bad 100644 --- a/scripts/Dpkg/Vendor/Debian.pm +++ b/scripts/Dpkg/Vendor/Debian.pm @@ -466,7 +466,7 @@ sub _build_tainted_by { File::Find::find({ wanted => sub { $tainted{"usr-local-has-$type"} = 1 if -f }, no_chdir => 1, - }, map { "/usr/local/$_" } @{$usr_local_types{$type}}); + }, grep { -d } map { "/usr/local/$_" } @{$usr_local_types{$type}}); } my @tainted = sort keys %tainted; |