diff options
| -rw-r--r-- | urpm.pm | 10 | ||||
| -rw-r--r-- | urpmi.spec | 5 |
2 files changed, 9 insertions, 6 deletions
@@ -117,15 +117,15 @@ sub sync_webfetch { sync_file($options, @{$files{removable} || []}, @{$files{file} || []}); delete @files{qw(removable file)}; } - if ($files{ftp} || $files{http}) { + if ($files{ftp} || $files{http} || $files{https}) { if (-x "/usr/bin/curl" && (! ref($options) || $options->{prefer} ne 'wget' || ! -x "/usr/bin/wget")) { - sync_curl($options, @{$files{ftp} || []}, @{$files{http} || []}); + sync_curl($options, @{$files{ftp} || []}, @{$files{http} || []}, @{$files{https} || []}); } elsif (-x "/usr/bin/wget") { - sync_wget($options, @{$files{ftp} || []}, @{$files{http} || []}); + sync_wget($options, @{$files{ftp} || []}, @{$files{http} || []}, @{$files{https} || []}); } else { die N("no webfetch (curl or wget currently) found\n"); } - delete @files{qw(ftp http)}; + delete @files{qw(ftp http https)}; } if ($files{rsync}) { sync_rsync($options, @{$files{rsync} || []}); @@ -262,7 +262,7 @@ sub sync_curl { open CURL, join(" ", map { "'$_'" } "/usr/bin/curl", (ref($options) && $options->{limit_rate} ? ("--limit-rate", $options->{limit_rate}) : ()), (ref($options) && $options->{proxy} ? set_proxy({ type => "curl", proxy => $options->{proxy} }) : ()), - (ref($options) && $options->{quiet} && !$options->{verbose} ? "-s" : @{[]}), "-R", "-f", "--stderr", "-", + (ref($options) && $options->{quiet} && !$options->{verbose} ? "-s" : @{[]}), "-R", "-f", "-k", "--stderr", "-", @all_files) . " |"; local $/ = \1; #- read input by only one char, this is slow but very nice (and it works!). while (<CURL>) { @@ -2,7 +2,7 @@ Name: urpmi Version: 4.2 -Release: 31mdk +Release: 32mdk License: GPL Source0: %{name}.tar.bz2 Source1: %{name}.logrotate @@ -199,6 +199,9 @@ $urpm->update_media; %changelog +* Wed Mar 12 2003 François Pons <fpons@mandrakesoft.com> 4.2-32mdk +- added https:// protocol. (avoid curl limitation and fix bug 3226). + * Mon Mar 10 2003 François Pons <fpons@mandrakesoft.com> 4.2-31mdk - try to be somewhat perl_checker compliant. - strict require on urpmi. |