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

(-)a/C4/Installer/PerlDependencies.pm (+5 lines)
Lines 732-737 our $PERL_DEPS = { Link Here
732
        'required' => '1',
732
        'required' => '1',
733
        'min_ver'  => '0.91',
733
        'min_ver'  => '0.91',
734
    },
734
    },
735
    'LWP::Protocol::https' => {
736
        'usage'    => 'OverDrive integration',
737
        'required' => '0',
738
        'min_ver'  => '5.836',
739
    },
735
};
740
};
736
741
737
1;
742
1;
(-)a/debian/list-deps (-6 / +7 lines)
Lines 25-31 use C4::Installer::PerlDependencies; Link Here
25
# These are packages that may not be in the apt archive in a way that
25
# These are packages that may not be in the apt archive in a way that
26
# apt-file can find, e.g. in the Koha repo rather than the regular
26
# apt-file can find, e.g. in the Koha repo rather than the regular
27
# debian one.
27
# debian one.
28
my %overrides = ();
28
my %overrides = (
29
    'LWP::Protocol::https' => 'liblwp-protocol-https-perl|libwww-perl (<6.02), libio-socket-ssl-perl',
30
);
29
31
30
# These are packages we're going to ignore
32
# These are packages we're going to ignore
31
my %ignore = (
33
my %ignore = (
Lines 55-61 foreach my $module ( keys %$deps ) { Link Here
55
            @lines = ( @lines, $line );
57
            @lines = ( @lines, $line );
56
        }
58
        }
57
    }
59
    }
58
    if ( scalar(@lines) == 1 && $lines[0] ne "" ) {
60
    if ( exists $overrides{$module} ) {
61
        print "$overrides{$module}\n";
62
    }
63
    elsif ( scalar(@lines) == 1 && $lines[0] ne "" ) {
59
        my $pkg = $lines[0];
64
        my $pkg = $lines[0];
60
        print "$pkg\n";
65
        print "$pkg\n";
61
    }
66
    }
Lines 80-88 foreach my $module ( keys %$deps ) { Link Here
80
        # commit.)
85
        # commit.)
81
        # RM note: suspicious?  me?  always!
86
        # RM note: suspicious?  me?  always!
82
    }
87
    }
83
    elsif ( exists $overrides{$module} ) {
84
        print "$overrides{$module}\n";
85
    }
86
    elsif ( ! $deps->{$module}->{'required'} ) {
88
    elsif ( ! $deps->{$module}->{'required'} ) {
87
        # Ignore because we don't have it and we don't care.
89
        # Ignore because we don't have it and we don't care.
88
    }
90
    }
89
- 

Return to bug 12393