Revert "Bug 6679 - [SIGNED-OFF] fix 2 perlcritic violations in C4/Installer/PerlModules.pm"
This reverts commit
0e356b214eb049a446a8d089d579775aa49287d7.
Fixing the evals in PerlModules.pm to pass perl critic has caused
a regression. If appears that using a block eval will not work here,
at least not in its current form.
my %params = @_;
if ($params{'module'}) {
return -1 unless grep {m/$params{'module'}/} keys(%$PERL_DEPS);
- eval {require $params{'module'}};
+ eval "require $params{'module'}";
if ($@) {
return {$params{'module'} => {cur_ver => 0, min_ver => $PERL_DEPS->{$_}->{'min_ver'}, upgrade => 0, required => $PERL_DEPS->{$_}->{'required'}, usage => $PERL_DEPS->{$_}->{'usage'}}};
}
else {
for (sort keys(%{$PERL_DEPS})) {
my $pkg = $_; # $_ holds the string
- eval {require $pkg};
+ eval "require $pkg";
if ($@) {
push (@{$self->{'missing_pm'}}, {$_ => {cur_ver => 0, min_ver => $PERL_DEPS->{$_}->{'min_ver'}, required => $PERL_DEPS->{$_}->{'required'}, usage => $PERL_DEPS->{$_}->{'usage'}}});
}