summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillem Jover <guillem@debian.org>2013-01-01 14:32:44 +0100
committerGuillem Jover <guillem@debian.org>2013-05-08 04:50:19 +0200
commitdd789aa78710c5f996498f86893a30dee8db9dfe (patch)
tree7bb1cd3597c71933d151b4cae6dcfa672623a568
parent503c1e8a4689fe3c329a2ff1dd7f3c2db0d60d3f (diff)
downloaddpkg-dd789aa78710c5f996498f86893a30dee8db9dfe.tar.gz
scripts: On split use an actual regex instead of a literal string
Fixes BuiltinFunctions::ProhibitStringySplit. Warned-by: perlcritic
-rw-r--r--scripts/Dpkg/Arch.pm4
-rw-r--r--scripts/Dpkg/Vendor/Debian.pm2
-rw-r--r--test/100_critic.t1
3 files changed, 4 insertions, 3 deletions
diff --git a/scripts/Dpkg/Arch.pm b/scripts/Dpkg/Arch.pm
index 231b9bb3f..06cfe59d2 100644
--- a/scripts/Dpkg/Arch.pm
+++ b/scripts/Dpkg/Arch.pm
@@ -291,7 +291,7 @@ sub gnutriplet_to_debtriplet($)
sub gnutriplet_to_multiarch($)
{
my ($gnu) = @_;
- my ($cpu, $cdr) = split('-', $gnu, 2);
+ my ($cpu, $cdr) = split(/-/, $gnu, 2);
if ($cpu =~ /^i[456]86$/) {
return "i386-$cdr";
@@ -339,7 +339,7 @@ sub debarch_to_debtriplet($)
my $triplet = $debarch_to_debtriplet{$arch};
if (defined($triplet)) {
- return split('-', $triplet, 3);
+ return split(/-/, $triplet, 3);
} else {
return;
}
diff --git a/scripts/Dpkg/Vendor/Debian.pm b/scripts/Dpkg/Vendor/Debian.pm
index 6f5b67823..269e1c98e 100644
--- a/scripts/Dpkg/Vendor/Debian.pm
+++ b/scripts/Dpkg/Vendor/Debian.pm
@@ -95,7 +95,7 @@ sub add_hardening_flags {
# Adjust features based on Maintainer's desires.
my $opts = Dpkg::BuildOptions->new(envvar => 'DEB_BUILD_MAINT_OPTIONS');
- foreach my $feature (split(',', $opts->get('hardening') // '')) {
+ foreach my $feature (split(/,/, $opts->get('hardening') // '')) {
$feature = lc($feature);
if ($feature =~ s/^([+-])//) {
my $value = ($1 eq '+') ? 1 : 0;
diff --git a/test/100_critic.t b/test/100_critic.t
index f064e5ed1..489c13a34 100644
--- a/test/100_critic.t
+++ b/test/100_critic.t
@@ -37,6 +37,7 @@ my @policies = qw(
BuiltinFunctions::ProhibitLvalueSubstr
BuiltinFunctions::ProhibitReverseSortBlock
BuiltinFunctions::ProhibitSleepViaSelect
+ BuiltinFunctions::ProhibitStringySplit
BuiltinFunctions::ProhibitUniversalCan
BuiltinFunctions::ProhibitUniversalIsa
BuiltinFunctions::RequireGlobFunction