summaryrefslogtreecommitdiffstats
path: root/urpm
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2004-05-21 07:57:55 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2004-05-21 07:57:55 +0000
commite227e7173027b99d6761241872e7459eaf691ac5 (patch)
treeaf91f66cb5931ad77de928d7604d7a9455caad2f /urpm
parenta541073dd2d114840ce359f96d8d60cb77d73915 (diff)
downloadurpmi-e227e7173027b99d6761241872e7459eaf691ac5.tar
urpmi-e227e7173027b99d6761241872e7459eaf691ac5.tar.gz
urpmi-e227e7173027b99d6761241872e7459eaf691ac5.tar.bz2
urpmi-e227e7173027b99d6761241872e7459eaf691ac5.tar.xz
urpmi-e227e7173027b99d6761241872e7459eaf691ac5.zip
The --proxy option was broken.
Diffstat (limited to 'urpm')
-rw-r--r--urpm/args.pm8
1 files changed, 4 insertions, 4 deletions
diff --git a/urpm/args.pm b/urpm/args.pm
index 97b1472c..67da7130 100644
--- a/urpm/args.pm
+++ b/urpm/args.pm
@@ -80,14 +80,14 @@ my %options_spec = (
curl => sub { $urpm->{options}{downloader} = 'curl' },
'limit-rate=s' => sub { $urpm->{options}{'limit-rate'} = $_[1] },
'resume!' => sub { $urpm->{options}{resume} = $_[1] },
- proxy => sub {
+ 'proxy=s' => sub {
my (undef, $value) = @_;
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";
},
- 'proxy-user' => sub {
+ '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);
@@ -278,12 +278,12 @@ foreach my $k ("help|h", "no-locales", "update", "media|mediums=s",
$options_spec{urpmf}{$k} = $options_spec{urpmi}{$k};
}
-foreach my $k ("help|h", "wget", "curl", "proxy", "proxy-user") {
+foreach my $k ("help|h", "wget", "curl", "proxy=s", "proxy-user=s") {
$options_spec{'urpmi.update'}{$k} =
$options_spec{urpmq}{$k} = $options_spec{urpmi}{$k};
}
-foreach my $k ("help|h", "wget", "curl", "proxy", "proxy-user", "c", "f", "z",
+foreach my $k ("help|h", "wget", "curl", "proxy=s", "proxy-user=s", "c", "f", "z",
"limit-rate=s", "no-md5sum", "update")
{
$options_spec{'urpmi.addmedia'}{$k} = $options_spec{'urpmi.update'}{$k};