[Reproducible-commits] [dpkg] 01/37: scripts: Do not abort when traversing symlinks to directories

[Jérémy Bobbio]

This is an automated email from the git hooks/post-receive script.

lunar pushed a commit to branch pu/buildinfo
in repository dpkg.

commit 6ca0dfd078e9ac9303b2cbede58c239f06531a47
Author: Guillem Jover <guillem at debian.org>
Date:   Tue Dec 29 02:52:17 2015 +0100

    scripts: Do not abort when traversing symlinks to directories
    
    dpkg-scanpackages and dpkg-scansources started using File::Find since
    commit 3f8099b21bbb934d03c340fef1925824465e0571, but did not get
    passed «follow_skip => 2».
    
    Closes: #809219
---
 debian/changelog             | 2 ++
 scripts/dpkg-scanpackages.pl | 2 +-
 scripts/dpkg-scansources.pl  | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b40b36e..8bf6cbd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ dpkg (1.18.5) UNRELEASED; urgency=medium
 
   * Print correct integer parse error for short-only command-line options.
     This affects «dpkg-deb -z». Closes: #809174
+  * Do not abort when traversing symlinks to directories in dpkg-scanpackages
+    and dpkg-scansources. Closes: #809219
   * Documentation:
     - Say value instead of option in deb-control(5).
     - Mark debian changelog format in bold in dpkg-parsechangelog(1).
diff --git a/scripts/dpkg-scanpackages.pl b/scripts/dpkg-scanpackages.pl
index 7d7a121..26a3b0d 100755
--- a/scripts/dpkg-scanpackages.pl
+++ b/scripts/dpkg-scanpackages.pl
@@ -253,7 +253,7 @@ my $scan_archives = sub {
     push @archives, $File::Find::name if m/$find_filter/;
 };
 
-find({ follow => 1, wanted => $scan_archives}, $binarydir);
+find({ follow => 1, follow_skip => 2, wanted => $scan_archives}, $binarydir);
 foreach my $fn (@archives) {
     process_deb($pathprefix, $fn);
 }
diff --git a/scripts/dpkg-scansources.pl b/scripts/dpkg-scansources.pl
index acd9e64..f8c6ea5 100755
--- a/scripts/dpkg-scansources.pl
+++ b/scripts/dpkg-scansources.pl
@@ -309,7 +309,7 @@ my $scan_dsc = sub {
     push @dsc, $File::Find::name if m/\.dsc$/;
 };
 
-find({ follow => 1, wanted => $scan_dsc }, $dir);
+find({ follow => 1, follow_skip => 2, wanted => $scan_dsc }, $dir);
 foreach my $fn (@dsc) {
     # FIXME: Fix it instead to not die on syntax and general errors?
     eval {

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