summaryrefslogtreecommitdiff
path: root/scripts/dpkg-mergechangelogs.pl
diff options
context:
space:
mode:
authorGuillem Jover <guillem@debian.org>2014-09-30 21:25:40 +0200
committerGuillem Jover <guillem@debian.org>2014-10-06 02:08:03 +0200
commit4502f420bd22eab1634d5a9c710c79d58e13e76e (patch)
tree7a52377a8f7579b25f97f62ba1e62c8634a9e1b9 /scripts/dpkg-mergechangelogs.pl
parent386e46306f1f6dbb84296f9be1379de10b1cc535 (diff)
downloaddpkg-4502f420bd22eab1634d5a9c710c79d58e13e76e.tar.gz
scripts: Unpack arguments instead of accessing @_ directly
Addresses Subroutines::RequireArgUnpacking. Warned-by: perlcritic
Diffstat (limited to 'scripts/dpkg-mergechangelogs.pl')
-rwxr-xr-xscripts/dpkg-mergechangelogs.pl6
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/dpkg-mergechangelogs.pl b/scripts/dpkg-mergechangelogs.pl
index a2819348a..779c8c1b1 100755
--- a/scripts/dpkg-mergechangelogs.pl
+++ b/scripts/dpkg-mergechangelogs.pl
@@ -110,7 +110,8 @@ my @result; # Lines to output
my $exitcode = 0; # 1 if conflict encountered
unless (merge_block($cho, $cha, $chb, sub {
- my $tail = $_[0]->get_unparsed_tail();
+ my $changes = shift;
+ my $tail = $changes->get_unparsed_tail();
chomp $tail if defined $tail;
return $tail;
}))
@@ -214,8 +215,9 @@ sub merge_entries($$$) {
$a->get_part('changes'), $b->get_part('changes'),
{
CONFLICT => sub {
+ my ($ca, $cb) = @_;
$exitcode = 1;
- return get_conflict_block($_[0], $_[1]);
+ return get_conflict_block($ca, $cb);
}
});
unshift @result, @merged;