diff options
| author | Guillaume Cottenceau <gc@mandriva.com> | 2002-08-30 18:15:36 +0000 |
|---|---|---|
| committer | Guillaume Cottenceau <gc@mandriva.com> | 2002-08-30 18:15:36 +0000 |
| commit | 825a6a0d7b41e624c01d0236ec73d31296c352c6 (patch) | |
| tree | 9932bf3bb6ca7b5d10ca80aca7e4d122a402d5bd /grpmi/grpmi.pl | |
| parent | 0e08c3052db01f30ac90f56c6d57a8ec3b01e29b (diff) | |
| download | rpmdrake-825a6a0d7b41e624c01d0236ec73d31296c352c6.tar rpmdrake-825a6a0d7b41e624c01d0236ec73d31296c352c6.tar.gz rpmdrake-825a6a0d7b41e624c01d0236ec73d31296c352c6.tar.bz2 rpmdrake-825a6a0d7b41e624c01d0236ec73d31296c352c6.tar.xz rpmdrake-825a6a0d7b41e624c01d0236ec73d31296c352c6.zip | |
handle /etc/urpmi/proxy.cfg proxies, have a proxy dialog config in
edit-urpm-sources
Diffstat (limited to 'grpmi/grpmi.pl')
| -rwxr-xr-x | grpmi/grpmi.pl | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/grpmi/grpmi.pl b/grpmi/grpmi.pl index ea9c165b..b76f23a3 100755 --- a/grpmi/grpmi.pl +++ b/grpmi/grpmi.pl @@ -81,8 +81,6 @@ my $exitstatus = -1; # -=-=-=---=-=-=---=-=-=-- download potential URL's, and verify signatures -=-=-=---=-=-=-- -my $proxy; -/http_proxy = (http:[^:]+:\d+)/ and $proxy = $1 foreach cat_("$ENV{HOME}/.wgetrc"); my $cache_location = '/var/cache/urpmi/rpms'; my $url_regexp = '^http://|^https://|^ftp://'; my $nb_downloads = int(grep { m,$url_regexp, } @ARGV); @@ -93,8 +91,7 @@ for (my $i=0; $i<@ARGV; $i++) { $download_progress++; $label->set(_("Downloading package `%s' (%s/%s)...", basename($ARGV[$i]), $download_progress, $nb_downloads)); select(undef, undef, undef, 0.1); $mainw->flush; #- hackish :-( - my $res = curl_download::download($ARGV[$i], $cache_location, $proxy, - sub { $_[0] and $progressbar->update($_[1]/$_[0]); $mainw->flush }); + my $res = curl_download::download($ARGV[$i], $cache_location, sub { $_[0] and $progressbar->update($_[1]/$_[0]); $mainw->flush }); my $url = $ARGV[$i]; $ARGV[$i] = "$cache_location/" . basename($ARGV[$i]); if ($res) { |