3.7-3mdk

1 files changed, 18 insertions, 0 deletions

diff --git a/urpmq b/urpmq
index 35f7b095..900980d4 100755
--- a/urpmq
+++ b/urpmq
@@ -58,6 +58,12 @@ usage:
                    stdout (root only).
 ") . _("  --sources      - give all source packages before downloading (root only).
 ") . _("  --force        - force invocation even if some packages do not exist.
+") . _("  --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>).
 ") . "\n" . _("  names or rpm files given on command line are queried.
 ", $urpm::VERSION);
     exit(0);
@@ -86,6 +92,18 @@ for (@ARGV) {
 					      else { $options = { dir => $options, prefer => 'wget' } }
 					      urpm::sync_webfetch($options, @_) }; next };
     /^--curl$/ and do { $urpm->{sync} = \&urpm::sync_webfetch; next };
+    /^--proxy$/ and do {
+		($_ = shift @_) =~ m,^http://([^:]+)(:([\d]+)|[^:])$, or usage;
+		$_ .= ":1080" if /[^\d]/;
+		$urpm->{proxy}->{http_proxy} = $_;
+		next;
+	};
+    /^--proxy-user$/ and do {
+		($_ = shift @_) =~ /(.+):(.+)/, or usage;
+		$urpm->{proxy}->{user} = $1;
+		$urpm->{proxy}->{pwd} = $2;
+		next;
+	};
     /^-(.*)$/ and do { foreach (split //, $1) {
 	/[\?h]/ and do { usage; next };
 	/d/ and do { $query->{deps} = 1; next };