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

(-)a/C4/Installer/PerlModules.pm (-2 / +31 lines)
Lines 80-87 sub version_info { Link Here
80
        }
80
        }
81
    }
81
    }
82
    else {
82
    else {
83
        for (sort keys(%{$PERL_DEPS})) {
83
        my $Readonly_XS_Version;
84
        PERLDEP: for (sort keys(%{$PERL_DEPS})) {
84
            my $pkg = $_;  #  $_ holds the string
85
            my $pkg = $_;  #  $_ holds the string
86
            if ($pkg eq 'Readonly::XS') {
87
                eval {
88
                    use Readonly;
89
                    if ($Readonly::XSokay) {
90
                        if (-e "/usr/bin/dpkg") {
91
                            my @data =
92
                              `/usr/bin/dpkg -l libreadonly-xs-perl`;
93
                            my $line = pop @data;
94
                            # line is likely:
95
                            # ii  libreadonly-xs {version}
96
                            # col0  col1 col2
97
                            # handle the extra spaces to get col2
98
                            $line =~ s/  / /g;
99
                            @data = split(/ /,$line);
100
                            $Readonly_XS_Version = $data[2];
101
                        }
102
                    }
103
                };
104
                if (!$Readonly_XS_Version) {
105
                    push (@{$self->{'missing_pm'}}, {$_ => {cur_ver => 0, min_ver => $PERL_DEPS->{$_}->{'min_ver'}, required => $PERL_DEPS->{$_}->{'required'}, usage => $PERL_DEPS->{$_}->{'usage'}}});
106
                }
107
                elsif ($Readonly_XS_Version lt $PERL_DEPS->{$_}->{'min_ver'}) {
108
                    push (@{$self->{'upgrade_pm'}}, {$_ => {cur_ver => $Readonly_XS_Version, min_ver => $PERL_DEPS->{$_}->{'min_ver'}, required => $PERL_DEPS->{$_}->{'required'}, usage => $PERL_DEPS->{$_}->{'usage'}}});
109
                }
110
                else {
111
                    push (@{$self->{'current_pm'}}, {$_ => {cur_ver => $Readonly_XS_Version, min_ver => $PERL_DEPS->{$_}->{'min_ver'}, required => $PERL_DEPS->{$_}->{'required'}, usage => $PERL_DEPS->{$_}->{'usage'}}});
112
                }
113
                next PERLDEP;
114
            }
85
            eval "require $pkg";
115
            eval "require $pkg";
86
            if ($@) {
116
            if ($@) {
87
                push (@{$self->{'missing_pm'}}, {$_ => {cur_ver => 0, min_ver => $PERL_DEPS->{$_}->{'min_ver'}, required => $PERL_DEPS->{$_}->{'required'}, usage => $PERL_DEPS->{$_}->{'usage'}}});
117
                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