From c30ec2d5c47292e918a388e92a5836f57e8ee3a4 Mon Sep 17 00:00:00 2001 From: Mason James Date: Wed, 27 Jun 2012 05:07:46 +1200 Subject: [PATCH 1/1] Bug 6679 - [SIGNED-OFF] fix 2 perlcritic violations in C4/Installer/PerlModules.pm Expression form of "eval" at line 71, column 9. See page 161 of PBP. (Severity: 5) Expression form of "eval" at line 85, column 13. See page 161 of PBP. (Severity: 5) Signed-off-by: Jonathan Druart --- C4/Installer/PerlModules.pm | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/C4/Installer/PerlModules.pm b/C4/Installer/PerlModules.pm index 2f40cf5..655db74 100644 --- a/C4/Installer/PerlModules.pm +++ b/C4/Installer/PerlModules.pm @@ -68,7 +68,7 @@ sub version_info { 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'}}}; } @@ -82,7 +82,7 @@ sub version_info { 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'}}}); } -- 1.7.7.3