From 4f0fbf247f66c0171e0c6e4361d7125e2c163703 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 10 Jul 2008 08:35:47 +0000
Subject: cleanup, and also add --metalink on urpmq (no reason not to have it
 there too)

---
 urpm/args.pm | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'urpm/args.pm')

diff --git a/urpm/args.pm b/urpm/args.pm
index 68a6ed03..1f90156c 100644
--- a/urpm/args.pm
+++ b/urpm/args.pm
@@ -330,7 +330,6 @@ my %options_spec = (
 	    }
 	    push @::cmdline, $p;
 	},
-	metalink => sub { $urpm->{options}{metalink} = 1 },
     },
 
     'urpmi.addmedia' => {
@@ -344,7 +343,6 @@ my %options_spec = (
 	virtual => \$options{virtual},
 	nopubkey => \$options{nopubkey},
 	raw => \$options{raw},
-	metalink => sub { $urpm->{options}{metalink} = 1 },
     },
 
     'urpmi.recover' => {
@@ -431,7 +429,7 @@ foreach my $k ("help|h", "version", "update", "media|mediums=s",
 }
 
 foreach my $k ("help|h", "version", "wget", "curl", "prozilla", "aria2", 'downloader=s', "proxy=s", "proxy-user=s",
-    'limit-rate=s',
+    'limit-rate=s', 'metalink',
     "wget-options=s", "curl-options=s", "rsync-options=s", "prozilla-options=s", "aria2-options=s")
 {
     $options_spec{'urpmi.update'}{$k} =
@@ -439,7 +437,7 @@ foreach my $k ("help|h", "version", "wget", "curl", "prozilla", "aria2", 'downlo
 }
 
 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",
+    "limit-rate=s", "no-md5sum", "update", "norebuild!", "probe-rpms", 'metalink',
     "wget-options=s", "curl-options=s", "rsync-options=s", "prozilla-options=s", "aria2-options=s", '<>')
 {
     $options_spec{'urpmi.addmedia'}{$k} = $options_spec{'urpmi.update'}{$k};
-- 
cgit v1.2.1