projects
/
srvgit
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
109c610
)
Revert "Bug 6679: Fix 2 perlcritic violations in C4/Installer/PerlModules.pm"
author
Tomas Cohen Arazi
<tomascohen@gmail.com>
Tue, 26 May 2015 17:16:41 +0000
(14:16 -0300)
committer
Tomas Cohen Arazi
<tomascohen@gmail.com>
Tue, 26 May 2015 17:16:41 +0000
(14:16 -0300)
This reverts commit
7fbc7467b53784b41e1ef2db7a95ed69235c9c5e
.
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
C4/Installer/PerlModules.pm
patch
|
blob
|
history
diff --git
a/C4/Installer/PerlModules.pm
b/C4/Installer/PerlModules.pm
index
655db74
..
2f40cf5
100644
(file)
--- 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);
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'}}};
}
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
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'}}});
}
if ($@) {
push (@{$self->{'missing_pm'}}, {$_ => {cur_ver => 0, min_ver => $PERL_DEPS->{$_}->{'min_ver'}, required => $PERL_DEPS->{$_}->{'required'}, usage => $PERL_DEPS->{$_}->{'usage'}}});
}