diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2008-01-17 11:39:12 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2008-01-17 11:39:12 +0000 |
| commit | af7637f44d8b40f1945607f12f1b066a54dc6a8b (patch) | |
| tree | 39c0ba637befefc59c968e2b0dbc2243e409b4b1 /urpm | |
| parent | 28e1e09b989001e7af04ec8180a5cb380be02586 (diff) | |
| download | urpmi-af7637f44d8b40f1945607f12f1b066a54dc6a8b.tar urpmi-af7637f44d8b40f1945607f12f1b066a54dc6a8b.tar.gz urpmi-af7637f44d8b40f1945607f12f1b066a54dc6a8b.tar.bz2 urpmi-af7637f44d8b40f1945607f12f1b066a54dc6a8b.tar.xz urpmi-af7637f44d8b40f1945607f12f1b066a54dc6a8b.zip | |
- all tools:
o deprecate --curl and --wget in favor of --downloader curl
and --downloader --wget
Diffstat (limited to 'urpm')
| -rw-r--r-- | urpm/args.pm | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/urpm/args.pm b/urpm/args.pm index cc403a3f..b2542bd7 100644 --- a/urpm/args.pm +++ b/urpm/args.pm @@ -106,10 +106,14 @@ my %options_spec = ( 'allow-nodeps' => sub { $urpm->{options}{'allow-nodeps'} = 1 }, 'allow-force' => sub { $urpm->{options}{'allow-force'} = 1 }, 'parallel=s' => \$::parallel, + + # deprecated in favor of --downloader xxx wget => sub { $urpm->{options}{downloader} = 'wget' }, curl => sub { $urpm->{options}{downloader} = 'curl' }, prozilla => sub { $urpm->{options}{downloader} = 'prozilla' }, aria2 => sub { $urpm->{options}{downloader} = 'aria2' }, + 'downloader=s' => sub { $urpm->{options}{downloader} = $_[1] }, + 'curl-options=s' => sub { $urpm->{options}{'curl-options'} = $_[1] }, 'rsync-options=s' => sub { $urpm->{options}{'rsync-options'} = $_[1] }, 'wget-options=s' => sub { $urpm->{options}{'wget-options'} = $_[1] }, @@ -361,7 +365,7 @@ foreach my $k ("help|h", "version", "no-locales", "update", "media|mediums=s", $options_spec{urpmf}{$k} = $options_spec{urpmi}{$k}; } -foreach my $k ("help|h", "version", "wget", "curl", "prozilla", "aria2", "proxy=s", "proxy-user=s", +foreach my $k ("help|h", "version", "wget", "curl", "prozilla", "aria2", 'downloader=s', "proxy=s", "proxy-user=s", 'limit-rate=s', "wget-options=s", "curl-options=s", "rsync-options=s", "prozilla-options=s", "aria2-options=s") { @@ -369,7 +373,7 @@ foreach my $k ("help|h", "version", "wget", "curl", "prozilla", "aria2", "proxy= $options_spec{urpmq}{$k} = $options_spec{urpmi}{$k}; } -foreach my $k ("help|h", "wget", "curl", "prozilla", "aria2", "proxy=s", "proxy-user=s", "f", "z", +foreach my $k ("help|h", "wget", "curl", "prozilla", "aria2", 'downloader=s', "proxy=s", "proxy-user=s", "f", "z", "limit-rate=s", "no-md5sum", "update", "norebuild!", "probe-rpms", "wget-options=s", "curl-options=s", "rsync-options=s", "prozilla-options=s", "aria2-options=s", '<>') { |