[lintian] 02/03: collection/src-orig-index: Update bitrotted calls to Lintian::Command:spawn.
This is an automated email from the git hooks/post-receive script.
lamby pushed a commit to branch master
in repository lintian.
commit 9fac1e4fe36f48e203d750114e5a96791ca11e49
Author: Chris Lamb <lamby@debian.org>
Date: Sun Dec 24 15:44:09 2017 +0000
collection/src-orig-index: Update bitrotted calls to Lintian::Command:spawn.
---
collection/src-orig-index | 19 ++++++++++++-------
debian/changelog | 1 +
2 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/collection/src-orig-index b/collection/src-orig-index
index 65a253d..5bafc48 100755
--- a/collection/src-orig-index
+++ b/collection/src-orig-index
@@ -31,7 +31,7 @@ use autodie;
use lib "$ENV{'LINTIAN_ROOT'}/lib";
use Cwd();
use Lintian::Collect;
-use Lintian::Command qw(spawn);
+use Lintian::Command qw(spawn reap);
use Lintian::Processable::Package;
use Lintian::Util qw(internal_error);
@@ -209,12 +209,17 @@ sub index_orig {
}
# Now that we have the file names we want, write them out sorted to the index
# file.
- spawn(
- { fail => 'error', out => "$dir/src-orig-index.gz" },
- sub { print @result },
- '|', ['sort', '-k', '6'],
- '|', ['gzip', '-9nc']);
- return 1;
+ my %opts = (
+ out => "$dir/src-orig-index.gz",
+ fail => 'error',
+ pipe_in => FileHandle->new
+ );
+ spawn(\%opts, ['sort', '-k', '6'], '|', ['gzip', '-9nc']);
+ print {$opts{pipe_in}} @result;
+ close($opts{pipe_in});
+ reap(\%opts);
+
+ return;
}
collect(@ARGV) if $0 =~ m,(?:^|/)src-orig-index$,;
diff --git a/debian/changelog b/debian/changelog
index 8494455..b0b0219 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -44,6 +44,7 @@ lintian (2.5.66) UNRELEASED; urgency=medium
* collection/src-orig-index:
+ [CL] Correct references to generated filename.
+ + [CL] Update bitrotted calls to Lintian::Command:spawn.
* data/debhelper/compat-level:
+ [MR] Bump the experimental debhelper compat level to 12.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: