[devscripts] 02/03: build-rdeps: Use glob() instead of File::Find to find files

[James McCoy]

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

jamessan pushed a commit to branch master
in repository devscripts.

commit 84a78324d4abb0ec5cd1628abaa63ce3b6440ff5
Author: James McCoy <jamessan at debian.org>
Date:   Mon Sep 28 20:50:48 2015 -0400

    build-rdeps: Use glob() instead of File::Find to find files
    
    Signed-off-by: James McCoy <jamessan at debian.org>
---
 debian/changelog       | 5 +++++
 scripts/build-rdeps.pl | 6 ++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8a8cdc5..83074f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,11 @@ devscripts (2.15.9) UNRELEASED; urgency=medium
   * annotate-output:
     + Optimize the case of FORMAT not containing any date format codes.
       Thanks to Stefan Fritsch for the patch.  (Closes: #799553)
+  * build-rdeps:
+    + Avoid recursing into apt's lists directory.  Only the top-level files
+      are interesting and this avoids a “Permission denied” warning with apt
+      versions that restrict access to the lists/partial directory.  Thanks to
+      James Cowgill for the patch.  (Closes: #798252)
 
   [ Dominique Dumont ]
   * licensecheck:
diff --git a/scripts/build-rdeps.pl b/scripts/build-rdeps.pl
index dbbb98f..4cdf548 100755
--- a/scripts/build-rdeps.pl
+++ b/scripts/build-rdeps.pl
@@ -91,7 +91,6 @@ and run apt-get update afterwards or use the update option of this tool.
 use warnings;
 use strict;
 use File::Basename;
-use File::Find;
 use Getopt::Long qw(:config gnu_getopt);
 use Pod::Usage;
 use Data::Dumper;
@@ -307,7 +306,10 @@ if ($opt_distribution) {
 }
 
 # Find sources files
-find(sub { readrelease($_, $1) if /$release_pattern/ }, $sources_path);
+chdir($sources_path);
+for my $release_file (glob "*") {
+	readrelease($release_file, $1) if $release_file =~ /$release_pattern/;
+}
 
 if (!@source_files) {
 	die "$progname: unable to find sources files.\nDid you forget to run apt-get update (or add --update to this command)?";

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git