3.7-3mdk

1 files changed, 16 insertions, 0 deletions

diff --git a/urpmi.addmedia b/urpmi.addmedia
index 3ef542e9..083b34f3 100755
--- a/urpmi.addmedia
+++ b/urpmi.addmedia
@@ -40,6 +40,10 @@ and [options] are from
 ") . _("  -f             - force generation of hdlist files.
 ") . _("  --wget         - use wget to retrieve distant files.
 ") . _("  --curl         - use curl to retrieve distant files.
+") . _("  --proxy        - use specified HTTP proxy, the port number is assumed
+                   to be 1080 by default (format is <proxyhost[:port]>).
+") . _("  --proxy-user   - specify user and password to use for proxy
+                   authentication (format is <user:password>).
 ") . _("  --update       - create an update medium.
 ") . _("  --distrib      - automatically create all media from an installation medium.
 ");
@@ -56,6 +60,18 @@ and [options] are from
 					    else { $options = { dir => $options, prefer => 'wget' } }
 					    urpm::sync_webfetch($options, @_) }, next;
 	/^--curl/ and $urpm->{sync} = \&urpm::sync_webfetch, next;
+	/^--proxy$/ and do {
+	    ($_ = shift @_) =~ m,^http://([^:]+)(:([\d]+)|[^:])$, or die $usage;
+	    $_ .= ":1080" if /[^\d]/;
+	    $urpm->{proxy}->{http_proxy} = $_;
+	    next;
+	};
+	/^--proxy-user$/ and do {
+	    ($_ = shift @_) =~ /(.+):(.+)/, or die $usage;
+	    $urpm->{proxy}->{user} = $1;
+	    $urpm->{proxy}->{pwd} = $2;
+	    next;
+	};
 	/^--distrib$/ and $options{distrib} = 1, next;
 	/^--update$/ and $options{update} = 1, next;
 	/^-/ and die $usage . _("\nunknown options '%s'\n", $_);