Add new switches to the urpm tools, --wget-options, --curl-options and

--rsync-options, to specify additionnal command-line options to pass to the
downloader programs. These are also available as global variables that can
be set in urpmi.cfg.

1 files changed, 8 insertions, 2 deletions

diff --git a/urpm/args.pm b/urpm/args.pm
index 4700402a..9b62d1d8 100644
--- a/urpm/args.pm
+++ b/urpm/args.pm
@@ -90,6 +90,9 @@ my %options_spec = (
 	'parallel=s' => \$::parallel,
 	wget => sub { $urpm->{options}{downloader} = 'wget' },
 	curl => sub { $urpm->{options}{downloader} = 'curl' },
+	'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] },
 	'limit-rate=s' => sub { $urpm->{options}{'limit-rate'} = $_[1] },
 	'resume!' => sub { $urpm->{options}{resume} = $_[1] },
 	'retry=s' => sub { $urpm->{options}{retry} = $_[1] },
@@ -349,13 +352,16 @@ 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", "proxy=s", "proxy-user=s") {
+foreach my $k ("help|h", "version", "wget", "curl", "proxy=s", "proxy-user=s",
+    "wget-options=s", "curl-options=s", "rsync-options=s")
+{
     $options_spec{'urpmi.update'}{$k} =
     $options_spec{urpmq}{$k} = $options_spec{urpmi}{$k};
 }
 
 foreach my $k ("help|h", "wget", "curl", "proxy=s", "proxy-user=s", "c", "f", "z",
-    "limit-rate=s", "no-md5sum", "update", "norebuild!")
+    "limit-rate=s", "no-md5sum", "update", "norebuild!",
+    "wget-options=s", "curl-options=s", "rsync-options=s")
 {
     $options_spec{'urpmi.addmedia'}{$k} = $options_spec{'urpmi.update'}{$k};
 }