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

(-)a/C4/Installer/PerlModules.pm (-2 / +28 lines)
Lines 4-9 use warnings; Link Here
4
use strict;
4
use strict;
5
5
6
use File::Spec;
6
use File::Spec;
7
use Data::Dumper;
7
8
8
use C4::Installer::PerlDependencies;
9
use C4::Installer::PerlDependencies;
9
10
Lines 80-87 sub version_info { Link Here
80
        }
81
        }
81
    }
82
    }
82
    else {
83
    else {
83
        for (sort keys(%{$PERL_DEPS})) {
84
        my $Readonly_XS_Version;
85
        PERLDEP: for (sort keys(%{$PERL_DEPS})) {
84
            my $pkg = $_;  #  $_ holds the string
86
            my $pkg = $_;  #  $_ holds the string
87
            if ($pkg eq 'Readonly::XS') {
88
                my @data;
89
                eval {
90
                    @data =
91
                      `/usr/bin/perldoc -m Readonly::XS`;
92
                };
93
                if (@data) {
94
                    my @filtered = grep { $_ =~ /\$VERSION\s*=\s*['"]/ } @data;
95
                    if (@filtered) {
96
                        my $line = $filtered[0];
97
                        my @data = split(/['"]/,$line);
98
                        $Readonly_XS_Version = $data[1];
99
                    }
100
                }
101
                if (!$Readonly_XS_Version) {
102
                    push (@{$self->{'missing_pm'}}, {$_ => {cur_ver => 0, min_ver => $PERL_DEPS->{$_}->{'min_ver'}, required => $PERL_DEPS->{$_}->{'required'}, usage => $PERL_DEPS->{$_}->{'usage'}}});
103
                }
104
                elsif ($Readonly_XS_Version lt $PERL_DEPS->{$_}->{'min_ver'}) {
105
                    push (@{$self->{'upgrade_pm'}}, {$_ => {cur_ver => $Readonly_XS_Version, min_ver => $PERL_DEPS->{$_}->{'min_ver'}, required => $PERL_DEPS->{$_}->{'required'}, usage => $PERL_DEPS->{$_}->{'usage'}}});
106
                }
107
                else {
108
                    push (@{$self->{'current_pm'}}, {$_ => {cur_ver => $Readonly_XS_Version, min_ver => $PERL_DEPS->{$_}->{'min_ver'}, required => $PERL_DEPS->{$_}->{'required'}, usage => $PERL_DEPS->{$_}->{'usage'}}});
109
                }
110
                next PERLDEP;
111
            }
85
            eval "require $pkg";
112
            eval "require $pkg";
86
            if ($@) {
113
            if ($@) {
87
                push (@{$self->{'missing_pm'}}, {$_ => {cur_ver => 0, min_ver => $PERL_DEPS->{$_}->{'min_ver'}, required => $PERL_DEPS->{$_}->{'required'}, usage => $PERL_DEPS->{$_}->{'usage'}}});
114
                push (@{$self->{'missing_pm'}}, {$_ => {cur_ver => 0, min_ver => $PERL_DEPS->{$_}->{'min_ver'}, required => $PERL_DEPS->{$_}->{'required'}, usage => $PERL_DEPS->{$_}->{'usage'}}});
88
- 

Return to bug 13767