This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch master in repository dpkg.
commit c3eb16614789f56bc68d0c6b58930e6700ecf0ac Author: Javier Serrano Polo <[email protected]> Date: Fri Aug 19 02:10:55 2016 +0200 dpkg-scanpackages: Support scanning a single binary file This makes it possible to pass a binary package pathname so that the tree does not need to be traversed. This also makes this command symetric with dpkg-scansources. Closes: #833964 Signed-off-by: Guillem Jover <[email protected]> --- debian/changelog | 2 ++ man/dpkg-scanpackages.man | 4 ++-- scripts/dpkg-scanpackages.pl | 8 ++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index a87402f..e21f800 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ dpkg (1.18.11) UNRELEASED; urgency=medium * Make dpkg-maintscript-helper conffile commands more robust. Check that conffile pathname arguments are absolute paths and verify version number to be valid. Thanks to David Kalnischkies <[email protected]>. + * Add support to dpkg-scanpackages for scanning a single binary file. + Thanks to Javier Serrano Polo <[email protected]>. Closes: #833964 * Packaging: - Add liblocale-gettext-perl to libdpkg-perl Recommends. - Wrap and document dependency relationships. diff --git a/man/dpkg-scanpackages.man b/man/dpkg-scanpackages.man index 3830495..348bf3d 100644 --- a/man/dpkg-scanpackages.man +++ b/man/dpkg-scanpackages.man @@ -25,7 +25,7 @@ dpkg\-scanpackages \- create Packages index files . .SH SYNOPSIS .B dpkg\-scanpackages -.RI [ option "...] " binary-dir +.RI [ option "...] " binary-path .RI [ override-file .RI [ path-prefix ]] .B > @@ -58,7 +58,7 @@ files except on local access (i.e. .B file:// sources). .PP -.I binary-dir +.I binary-path is the name of the tree of the binary packages to process (for example, .BR contrib/binary\-i386 ). It is best to make this relative to the root of the Debian archive, diff --git a/scripts/dpkg-scanpackages.pl b/scripts/dpkg-scanpackages.pl index 26a3b0d..b5d98e8 100755 --- a/scripts/dpkg-scanpackages.pl +++ b/scripts/dpkg-scanpackages.pl @@ -231,10 +231,10 @@ foreach my $alg (keys %hash) { } } -my ($binarydir, $override, $pathprefix) = @ARGV; +my ($binarypath, $override, $pathprefix) = @ARGV; -if (not -d $binarydir) { - error(g_('binary directory %s not found'), $binarydir); +if (not -e $binarypath) { + error(g_('binary path %s not found'), $binarypath); } if (defined $override and not -e $override) { error(g_('override file %s not found'), $override); @@ -253,7 +253,7 @@ my $scan_archives = sub { push @archives, $File::Find::name if m/$find_filter/; }; -find({ follow => 1, follow_skip => 2, wanted => $scan_archives}, $binarydir); +find({ follow => 1, follow_skip => 2, wanted => $scan_archives}, $binarypath); foreach my $fn (@archives) { process_deb($pathprefix, $fn); } -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/dpkg/dpkg.git
