diff options
| author | Guillem Jover <guillem@debian.org> | 2013-01-09 19:23:01 +0100 |
|---|---|---|
| committer | Guillem Jover <guillem@debian.org> | 2013-07-18 05:39:50 +0200 |
| commit | 2d04ad209e93d5814c68801001dc5f333027577f (patch) | |
| tree | 834c2d82c0a1a643b4c4b8b21428c1d5e38821ac | |
| parent | 89a8da04a92fd3cb913a5e24ff00385a753fd279 (diff) | |
| download | dpkg-2d04ad209e93d5814c68801001dc5f333027577f.tar.gz | |
dpkg-gencontrol: Move grep inside an if block
This makes the test explicit, and avoids confusing perlcritic of this
being a void grep.
Fixes BuiltinFunctions::ProhibitVoidGrep.
| -rwxr-xr-x | scripts/dpkg-gencontrol.pl | 3 | ||||
| -rw-r--r-- | test/100_critic.t | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/scripts/dpkg-gencontrol.pl b/scripts/dpkg-gencontrol.pl index 5cc3b764b..4116da4f8 100755 --- a/scripts/dpkg-gencontrol.pl +++ b/scripts/dpkg-gencontrol.pl @@ -209,10 +209,11 @@ foreach (keys %{$pkg}) { scalar(@invalid_archs)), join("' `", @invalid_archs)) if @invalid_archs >= 1; - grep(debarch_is($host_arch, $_), @archlist) || + if (! grep(debarch_is($host_arch, $_), @archlist)) { error(_g("current host architecture '%s' does not " . "appear in package's architecture list (%s)"), $host_arch, "@archlist"); + } $fields->{$_} = $host_arch; } } else { diff --git a/test/100_critic.t b/test/100_critic.t index cfcc692b7..eaa8ff40f 100644 --- a/test/100_critic.t +++ b/test/100_critic.t @@ -40,6 +40,7 @@ my @policies = qw( BuiltinFunctions::ProhibitStringySplit BuiltinFunctions::ProhibitUniversalCan BuiltinFunctions::ProhibitUniversalIsa + BuiltinFunctions::ProhibitVoidGrep BuiltinFunctions::RequireGlobFunction BuiltinFunctions::RequireSimpleSortBlock ClassHierarchies::ProhibitAutoloading |