summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2003-03-12 18:30:55 +0000
committerFrancois Pons <fpons@mandriva.com>2003-03-12 18:30:55 +0000
commit80e755e727937d4b8c3b240c64e4d150c1c85ff6 (patch)
tree8d10fa6bfaab7cac041a251e549b4c0776d2cbda
parent68275b73bd2eed865850c9f27f612deec6725813 (diff)
downloadurpmi-80e755e727937d4b8c3b240c64e4d150c1c85ff6.tar
urpmi-80e755e727937d4b8c3b240c64e4d150c1c85ff6.tar.gz
urpmi-80e755e727937d4b8c3b240c64e4d150c1c85ff6.tar.bz2
urpmi-80e755e727937d4b8c3b240c64e4d150c1c85ff6.tar.xz
urpmi-80e755e727937d4b8c3b240c64e4d150c1c85ff6.zip
4.2-32mdk
-rw-r--r--urpm.pm10
-rw-r--r--urpmi.spec5
2 files changed, 9 insertions, 6 deletions
diff --git a/urpm.pm b/urpm.pm
index ddc3d95a..de2470d7 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -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>) {
diff --git a/urpmi.spec b/urpmi.spec
index 23049c2a..30caadb8 100644
--- a/urpmi.spec
+++ b/urpmi.spec
@@ -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.