View | Details | Raw Unified | Return to bug 6679
Collapse All | Expand All

(-)a/C4/Installer/PerlModules.pm (-3 / +2 lines)
Lines 68-74 sub version_info { Link Here
68
    my %params = @_;
68
    my %params = @_;
69
    if ($params{'module'}) {
69
    if ($params{'module'}) {
70
        return -1 unless grep {m/$params{'module'}/} keys(%$PERL_DEPS);
70
        return -1 unless grep {m/$params{'module'}/} keys(%$PERL_DEPS);
71
        eval "require $params{'module'}";
71
        eval {require $params{'module'}};
72
        if ($@) {
72
        if ($@) {
73
            return {$params{'module'} => {cur_ver => 0, min_ver => $PERL_DEPS->{$_}->{'min_ver'}, upgrade => 0, required => $PERL_DEPS->{$_}->{'required'}, usage => $PERL_DEPS->{$_}->{'usage'}}};
73
            return {$params{'module'} => {cur_ver => 0, min_ver => $PERL_DEPS->{$_}->{'min_ver'}, upgrade => 0, required => $PERL_DEPS->{$_}->{'required'}, usage => $PERL_DEPS->{$_}->{'usage'}}};
74
        }
74
        }
Lines 82-88 sub version_info { Link Here
82
    else {
82
    else {
83
        for (sort keys(%{$PERL_DEPS})) {
83
        for (sort keys(%{$PERL_DEPS})) {
84
            my $pkg = $_;  #  $_ holds the string
84
            my $pkg = $_;  #  $_ holds the string
85
            eval "require $pkg";
85
            eval {require $pkg};
86
            if ($@) {
86
            if ($@) {
87
                push (@{$self->{'missing_pm'}}, {$_ => {cur_ver => 0, min_ver => $PERL_DEPS->{$_}->{'min_ver'}, required => $PERL_DEPS->{$_}->{'required'}, usage => $PERL_DEPS->{$_}->{'usage'}}});
87
                push (@{$self->{'missing_pm'}}, {$_ => {cur_ver => 0, min_ver => $PERL_DEPS->{$_}->{'min_ver'}, required => $PERL_DEPS->{$_}->{'required'}, usage => $PERL_DEPS->{$_}->{'usage'}}});
88
            }
88
            }
89
- 

Return to bug 6679