The following commit has been merged in the master branch:
commit 8d5d625cfdca593ba6f11a84760c97deb0f810e8
Author: Guillem Jover <[email protected]>
Date: Tue Jan 1 14:38:02 2013 +0100
scripts: Use the block form for the grep function
Fixes BuiltinFunctions::RequireBlockGrep.
diff --git a/scripts/dpkg-genchanges.pl b/scripts/dpkg-genchanges.pl
index bfe6ccf..a0eb8ba 100755
--- a/scripts/dpkg-genchanges.pl
+++ b/scripts/dpkg-genchanges.pl
@@ -430,7 +430,7 @@ if (!is_binaryonly) {
any { m/\.(debian\.tar|diff)\.$ext$/ } $checksums->get_files())
{
$origsrcmsg= _g('not including original source code in upload');
- foreach my $f (grep m/\.orig(-.+)?\.tar\.$ext$/,
$checksums->get_files()) {
+ foreach my $f (grep { m/\.orig(-.+)?\.tar\.$ext$/ }
$checksums->get_files()) {
$checksums->remove_file($f);
}
} else {
diff --git a/scripts/dpkg-gencontrol.pl b/scripts/dpkg-gencontrol.pl
index 878d762..263883e 100755
--- a/scripts/dpkg-gencontrol.pl
+++ b/scripts/dpkg-gencontrol.pl
@@ -204,7 +204,7 @@ foreach (keys %{$pkg}) {
$fields->{$_} = $v;
} else {
my @archlist = split(/\s+/, $v);
- my @invalid_archs = grep m/[^\w-]/, @archlist;
+ my @invalid_archs = grep { m/[^\w-]/ } @archlist;
warning(ngettext("`%s' is not a legal architecture string.",
"`%s' are not legal architecture strings.",
scalar(@invalid_archs)),
diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index 6d170da..bed3306 100755
--- a/scripts/dpkg-source.pl
+++ b/scripts/dpkg-source.pl
@@ -310,7 +310,7 @@ if ($options{opmode} =~
/^(-b|--print-format|--(before|after)-build|--commit)$/)
}
} else {
# Minimize arch list, by removing arches already covered by wildcards
- my @arch_wildcards = grep(debarch_is_wildcard($_), @sourcearch);
+ my @arch_wildcards = grep { debarch_is_wildcard($_) } @sourcearch;
my @mini_sourcearch = @arch_wildcards;
foreach my $arch (@sourcearch) {
if (none { debarch_is($arch, $_) } @arch_wildcards) {
diff --git a/test/100_critic.t b/test/100_critic.t
index 6d245d5..39d52ec 100644
--- a/test/100_critic.t
+++ b/test/100_critic.t
@@ -43,6 +43,7 @@ my @policies = qw(
BuiltinFunctions::ProhibitUniversalIsa
BuiltinFunctions::ProhibitVoidGrep
BuiltinFunctions::ProhibitVoidMap
+ BuiltinFunctions::RequireBlockGrep
BuiltinFunctions::RequireBlockMap
BuiltinFunctions::RequireGlobFunction
BuiltinFunctions::RequireSimpleSortBlock
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
