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

(-)a/C4/Installer/PerlModules.pm (-2 / +34 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/dpkg -l libreadonly-xs-perl`;
92
                };
93
                if (@data) {
94
                    my $line = pop @data;
95
                    if ($line =~ /libreadonly/) {
96
                        # line is likely:
97
                        # ii  libreadonly-xs {version}
98
                        # col0  col1 col2
99
                        # handle the extra spaces to get col2
100
                        $line =~ s/\s\s*/ /g;
101
                        @data = split(/ /,$line);
102
                        $line = $data[2];
103
                        @data = split(/-/,$line);
104
                        $Readonly_XS_Version = $data[0];
105
                    }
106
                }
107
                if (!$Readonly_XS_Version) {
108
                    push (@{$self->{'missing_pm'}}, {$_ => {cur_ver => 0, min_ver => $PERL_DEPS->{$_}->{'min_ver'}, required => $PERL_DEPS->{$_}->{'required'}, usage => $PERL_DEPS->{$_}->{'usage'}}});
109
                }
110
                elsif ($Readonly_XS_Version lt $PERL_DEPS->{$_}->{'min_ver'}) {
111
                    push (@{$self->{'upgrade_pm'}}, {$_ => {cur_ver => $Readonly_XS_Version, min_ver => $PERL_DEPS->{$_}->{'min_ver'}, required => $PERL_DEPS->{$_}->{'required'}, usage => $PERL_DEPS->{$_}->{'usage'}}});
112
                }
113
                else {
114
                    push (@{$self->{'current_pm'}}, {$_ => {cur_ver => $Readonly_XS_Version, min_ver => $PERL_DEPS->{$_}->{'min_ver'}, required => $PERL_DEPS->{$_}->{'required'}, usage => $PERL_DEPS->{$_}->{'usage'}}});
115
                }
116
                next PERLDEP;
117
            }
85
            eval "require $pkg";
118
            eval "require $pkg";
86
            if ($@) {
119
            if ($@) {
87
                push (@{$self->{'missing_pm'}}, {$_ => {cur_ver => 0, min_ver => $PERL_DEPS->{$_}->{'min_ver'}, required => $PERL_DEPS->{$_}->{'required'}, usage => $PERL_DEPS->{$_}->{'usage'}}});
120
                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