From e4fe9d43c11799cd6c1132388dddc9e915daf3d7 Mon Sep 17 00:00:00 2001 From: Rick van Schijndel Date: Sat, 17 Jan 2026 15:55:29 +0100 Subject: [PATCH] treewide: update split calls to make perlcritic happy In nixpkgs this started to fail the hydra tests. It's not completely clear why because it seems the perlcritic rule has existed for quite some time. Anyway, this should solve the issues. --- src/lib/Hydra/Controller/User.pm | 4 ++-- src/lib/Hydra/Plugin/EmailNotification.pm | 2 +- src/lib/Hydra/Plugin/GitInput.pm | 4 ++-- src/lib/Hydra/Plugin/GithubPulls.pm | 4 ++-- src/lib/Hydra/Plugin/GithubRefs.pm | 4 ++-- src/lib/Hydra/Plugin/GitlabPulls.pm | 4 ++-- src/lib/Hydra/Plugin/MercurialInput.pm | 2 +- src/lib/Hydra/Plugin/RunCommand.pm | 2 +- t/queue-runner/notifications.t | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/lib/Hydra/Controller/User.pm b/src/lib/Hydra/Controller/User.pm index 9e7d96e5..8d9b3f78 100644 --- a/src/lib/Hydra/Controller/User.pm +++ b/src/lib/Hydra/Controller/User.pm @@ -106,11 +106,11 @@ sub doEmailLogin { my $allowed_domains = $c->config->{allowed_domains} // ($c->config->{persona_allowed_domains} // ""); if ($allowed_domains ne "") { my $email_ok = 0; - my @domains = split ',', $allowed_domains; + my @domains = split /,/, $allowed_domains; map { $_ =~ s/^\s*(.*?)\s*$/$1/ } @domains; foreach my $domain (@domains) { - $email_ok = $email_ok || ((split '@', $email)[1] eq $domain); + $email_ok = $email_ok || ((split /@/, $email)[1] eq $domain); } error($c, "Your email address does not belong to a domain that is allowed to log in.\n") unless $email_ok; diff --git a/src/lib/Hydra/Plugin/EmailNotification.pm b/src/lib/Hydra/Plugin/EmailNotification.pm index a622f938..6c4948fa 100644 --- a/src/lib/Hydra/Plugin/EmailNotification.pm +++ b/src/lib/Hydra/Plugin/EmailNotification.pm @@ -71,7 +71,7 @@ sub buildFinished { my $to = $build->jobset->emailoverride ne "" ? $build->jobset->emailoverride : $build->maintainers; - foreach my $address (split ",", ($to // "")) { + foreach my $address (split /,/, ($to // "")) { $address = trim $address; $addresses{$address} //= { builds => [] }; diff --git a/src/lib/Hydra/Plugin/GitInput.pm b/src/lib/Hydra/Plugin/GitInput.pm index dee6be57..b751e29b 100644 --- a/src/lib/Hydra/Plugin/GitInput.pm +++ b/src/lib/Hydra/Plugin/GitInput.pm @@ -38,7 +38,7 @@ sub _parseValue { $start_options = 2; } foreach my $option (@parts[$start_options .. $#parts]) { - (my $key, my $value) = split('=', $option); + (my $key, my $value) = split(/=/, $option); $options->{$key} = $value; } return ($uri, $branch, $deepClone, $options); @@ -265,7 +265,7 @@ sub getCommits { my $res = []; foreach my $line (split /\n/, $out) { - my ($revision, $author, $email, $date) = split "\t", $line; + my ($revision, $author, $email, $date) = split /\t/, $line; push @$res, { revision => $revision, author => decode("utf-8", $author), email => $email }; } diff --git a/src/lib/Hydra/Plugin/GithubPulls.pm b/src/lib/Hydra/Plugin/GithubPulls.pm index 0ac7a08b..1202802e 100644 --- a/src/lib/Hydra/Plugin/GithubPulls.pm +++ b/src/lib/Hydra/Plugin/GithubPulls.pm @@ -31,10 +31,10 @@ sub _iterate { $pulls->{$pull->{number}} = $pull; } # TODO Make Link header parsing more robust!!! - my @links = split ',', ($res->header("Link") // ""); + my @links = split /,/, ($res->header("Link") // ""); my $next = ""; foreach my $link (@links) { - my ($url, $rel) = split ";", $link; + my ($url, $rel) = split /;/, $link; if (trim($rel) eq 'rel="next"') { $next = substr trim($url), 1, -1; last; diff --git a/src/lib/Hydra/Plugin/GithubRefs.pm b/src/lib/Hydra/Plugin/GithubRefs.pm index a686260b..7e44c6dc 100644 --- a/src/lib/Hydra/Plugin/GithubRefs.pm +++ b/src/lib/Hydra/Plugin/GithubRefs.pm @@ -83,10 +83,10 @@ sub _iterate { $refs->{$ref_name} = $ref; } # TODO Make Link header parsing more robust!!! - my @links = split ',', $res->header("Link"); + my @links = split /,/, $res->header("Link"); my $next = ""; foreach my $link (@links) { - my ($url, $rel) = split ";", $link; + my ($url, $rel) = split /;/, $link; if (trim($rel) eq 'rel="next"') { $next = substr trim($url), 1, -1; last; diff --git a/src/lib/Hydra/Plugin/GitlabPulls.pm b/src/lib/Hydra/Plugin/GitlabPulls.pm index 2963d93c..5f944521 100644 --- a/src/lib/Hydra/Plugin/GitlabPulls.pm +++ b/src/lib/Hydra/Plugin/GitlabPulls.pm @@ -49,10 +49,10 @@ sub _iterate { $pulls->{$pull->{iid}} = $pull; } # TODO Make Link header parsing more robust!!! - my @links = split ',', $res->header("Link"); + my @links = split /,/, $res->header("Link"); my $next = ""; foreach my $link (@links) { - my ($url, $rel) = split ";", $link; + my ($url, $rel) = split /;/, $link; if (trim($rel) eq 'rel="next"') { $next = substr trim($url), 1, -1; last; diff --git a/src/lib/Hydra/Plugin/MercurialInput.pm b/src/lib/Hydra/Plugin/MercurialInput.pm index 85bd2c70..9c069b72 100644 --- a/src/lib/Hydra/Plugin/MercurialInput.pm +++ b/src/lib/Hydra/Plugin/MercurialInput.pm @@ -126,7 +126,7 @@ sub getCommits { my $res = []; foreach my $line (split /\n/, $out) { if ($line ne "") { - my ($revision, $author, $email) = split "\t", $line; + my ($revision, $author, $email) = split /\t/, $line; push @$res, { revision => $revision, author => $author, email => $email }; } } diff --git a/src/lib/Hydra/Plugin/RunCommand.pm b/src/lib/Hydra/Plugin/RunCommand.pm index 43163764..6e395fa1 100644 --- a/src/lib/Hydra/Plugin/RunCommand.pm +++ b/src/lib/Hydra/Plugin/RunCommand.pm @@ -85,7 +85,7 @@ sub isBuildEligibleForDynamicRunCommand { sub configSectionMatches { my ($name, $project, $jobset, $job) = @_; - my @elems = split ':', $name; + my @elems = split /:/, $name; die "invalid section name '$name'\n" if scalar(@elems) > 3; diff --git a/t/queue-runner/notifications.t b/t/queue-runner/notifications.t index d0e72409..96b7ac39 100644 --- a/t/queue-runner/notifications.t +++ b/t/queue-runner/notifications.t @@ -109,7 +109,7 @@ subtest "Build: not substitutable, unsubstitutable" => sub { subtest "Second notification: step_finished" => sub { my ($channelName, $pid, $payload) = @{$dbh->func("pg_notifies")}; is($channelName, "step_finished", "The event is for the step finishing"); - my ($buildId, $stepNr, $logFile) = split "\t", $payload; + my ($buildId, $stepNr, $logFile) = split /\t/, $payload; is($buildId, $build->id, "The payload is the build's ID"); is($stepNr, 1, "The payload is the build's step number"); isnt($logFile, undef, "The log file is passed");