From 30df75df035e1dab1df228ea03e86738e9510f52 Mon Sep 17 00:00:00 2001
From: Rafael Garcia-Suarez <rgarciasuarez@mandriva.org>
Date: Mon, 10 Oct 2005 14:07:10 +0000
Subject: Don't allow media names that begin with -- in urpmi.addmedia and
 urpmi.update, to avoid naming mistakes

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

(limited to 'urpm')

diff --git a/urpm/args.pm b/urpm/args.pm
index a6d7275e..c808d8d6 100644
--- a/urpm/args.pm
+++ b/urpm/args.pm
@@ -265,7 +265,13 @@ my %options_spec = (
 	'q|quiet'   => sub { --$options{verbose} },
 	'v|verbose' => sub { ++$options{verbose} },
 	'norebuild!' => sub { $urpm->{options}{norebuild} = $_[1]; $options{force} = 0 },
-	'<>' => sub { push @::toupdates, $_[0] },
+	'<>' => sub {
+	    my ($p) = @_;
+	    if ($p =~ /^--?(.+)/) { # unrecognized option
+		die "Unknown option: $1\n";
+	    }
+	    push @::toupdates, $p;
+	},
     },
 
     'urpmi.addmedia' => {
@@ -282,7 +288,11 @@ my %options_spec = (
 	'v|verbose' => sub { ++$options{verbose} },
 	raw => \$options{raw},
 	'<>' => sub {
-	    push @::cmdline, $_[0];
+	    my ($p) = @_;
+	    if ($p =~ /^--?(.+)/) { # unrecognized option
+		die "Unknown option: $1\n";
+	    }
+	    push @::cmdline, $p;
 	},
     },
 
-- 
cgit v1.2.1