diff options
| author | Rafael Garcia-Suarez <rgarciasuarez@mandriva.org> | 2004-06-29 07:16:51 +0000 |
|---|---|---|
| committer | Rafael Garcia-Suarez <rgarciasuarez@mandriva.org> | 2004-06-29 07:16:51 +0000 |
| commit | c9e1ae1c9a310d2d1f237646ed381632cf071d4a (patch) | |
| tree | 650ee1fa057c3ca2905ac318c173578d314e8773 /urpm/args.pm | |
| parent | e1d903c8ea73f57ca704720dacc747c66a785a32 (diff) | |
| download | urpmi-c9e1ae1c9a310d2d1f237646ed381632cf071d4a.tar urpmi-c9e1ae1c9a310d2d1f237646ed381632cf071d4a.tar.gz urpmi-c9e1ae1c9a310d2d1f237646ed381632cf071d4a.tar.bz2 urpmi-c9e1ae1c9a310d2d1f237646ed381632cf071d4a.tar.xz urpmi-c9e1ae1c9a310d2d1f237646ed381632cf071d4a.zip | |
Support for setting proxy per-media in proxy.cfg
Diffstat (limited to 'urpm/args.pm')
| -rw-r--r-- | urpm/args.pm | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/urpm/args.pm b/urpm/args.pm index 67da7130..c55bf10e 100644 --- a/urpm/args.pm +++ b/urpm/args.pm @@ -4,6 +4,7 @@ use strict; use warnings; no warnings 'once'; use Getopt::Long;# 2.33; +use urpm::download; # The program that invokes us (my $tool = $0) =~ s!.*/!!; @@ -85,12 +86,14 @@ my %options_spec = ( my ($proxy, $port) = $value =~ m,^(?:http://)?([^:]+(:\d+)?)/*$, or die N("bad proxy declaration on command line\n"); $proxy .= ":1080" unless $port; - $urpm->{proxy}{http_proxy} = "http://$proxy"; + $urpm->{proxy}{http_proxy} = "http://$proxy"; #- obsolete, for compat + urpm::download::set_cmdline_proxy(http_proxy => "http://$proxy"); }, 'proxy-user=s' => sub { my (undef, $value) = @_; $value =~ /(.+):(.+)/ or die N("bad proxy declaration on command line\n"); - @{$urpm->{proxy}}{qw(user pwd)} = ($1, $2); + @{$urpm->{proxy}}{qw(user pwd)} = ($1, $2); #- obsolete, for compat + urpm::download::set_cmdline_proxy(user => $1, pwd => $2); }, 'bug=s' => \$options{bug}, 'env=s' => \$::env, |