diff options
| author | Christophe Fergeau <cfergeau@mandriva.com> | 2009-09-01 08:41:42 +0000 |
|---|---|---|
| committer | Christophe Fergeau <cfergeau@mandriva.com> | 2009-09-01 08:41:42 +0000 |
| commit | 25b5a1b9c893b4c46cd89a3e4d445a994aff05ca (patch) | |
| tree | 7871bb7120f38042bbd604ad7648c923609f0a91 /perl-install/install | |
| parent | 62f7d54e35f2d074f70f5f879db5979f6dbf0dad (diff) | |
| download | drakx-25b5a1b9c893b4c46cd89a3e4d445a994aff05ca.tar drakx-25b5a1b9c893b4c46cd89a3e4d445a994aff05ca.tar.gz drakx-25b5a1b9c893b4c46cd89a3e4d445a994aff05ca.tar.bz2 drakx-25b5a1b9c893b4c46cd89a3e4d445a994aff05ca.tar.xz drakx-25b5a1b9c893b4c46cd89a3e4d445a994aff05ca.zip | |
use https to download the mirrorlist from api.mandriva.com
Diffstat (limited to 'perl-install/install')
| -rw-r--r-- | perl-install/install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/install/http.pm | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index ffe3c8f5d..9f351eb64 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +- use https to grab mirrorlist from api.mandriva.com + Version 12.46 - 28 August 2009 - handle new drivers: diff --git a/perl-install/install/http.pm b/perl-install/install/http.pm index 236fd745f..1ef8755b3 100644 --- a/perl-install/install/http.pm +++ b/perl-install/install/http.pm @@ -8,8 +8,8 @@ sub close() { } sub getFile { - my ($url) = @_; - my ($_size, $fh) = get_file_and_size($url) or return; + my ($url, %o_options) = @_; + my ($_size, $fh) = get_file_and_size($url, %o_options) or return; $fh; } @@ -30,7 +30,7 @@ sub get_file_and_size_ { } sub get_file_and_size { - my ($url) = @_; + my ($url, %o_options) = @_; # can be used for ftp urls (with http proxy) my ($host) = parse_http_url($url); @@ -54,7 +54,7 @@ sub get_file_and_size { urpm::download::set_cmdline_proxy(http_proxy => "http://$proxy/"); } - my $res = eval { urpm::download::sync_url($urpm, $url, dir => $cachedir) }; + my $res = eval { urpm::download::sync_url($urpm, $url, %o_options, dir => $cachedir) }; if ($res) { open(my $f, $file); (-s $file, $f); |