aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS4
-rwxr-xr-xgurpmi.addmedia10
2 files changed, 13 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index daabf806..6935b79b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+- gurpmi.addmedia:
+ o handle --mirrorlist
+ o drop 'with' parameter, it didn't work properly anymore (Anssi)
+
Version 4.9.8 - 25 March 2008, Thierry Vignaud
- ensure we always restart if needed
diff --git a/gurpmi.addmedia b/gurpmi.addmedia
index 77b09361..993891e5 100755
--- a/gurpmi.addmedia
+++ b/gurpmi.addmedia
@@ -40,6 +40,7 @@ and [options] are from
--distrib install a set of media from a distribution
--silent-success don't show popup window on success
--update create an update medium.
+ --mirrorlist <url> is a mirror list
";
exit(0);
};
@@ -64,11 +65,13 @@ if (@ARGV == 1 && $ARGV[0] =~ /\.urpmi-media$/) {
}
my ($update, $distrib, $silent_success) = (0, 0, 0);
+my ($mirrorlist, $with_dir);
GetOptions(
'update' => \$update,
'distrib' => \$distrib,
'silent-success' => \$silent_success,
+ 'mirrorlist=s' => \$mirrorlist,
);
# compatibility with -update:
@@ -82,7 +85,10 @@ my @names;
while (@ARGV) {
my ($name, $url) = @ARGV;
- if ($url !~ m,^(([^:]*):/)?/,) {
+
+ if ($mirrorlist) {
+ ($with_dir, $url) = ($url, undef);
+ } elsif ($url !~ m,^(([^:]*):/)?/,) {
interactive_msg('gurpmi.addmedia',
N("bad <url> (for local directory, the path must be absolute)") . "\n\n$url");
myexit(-1);
@@ -119,6 +125,8 @@ foreach (@addmedia_args) {
$_->[1],
if_(!$distrib, undef),
if_($update, update => $update),
+ mirrorlist => $mirrorlist,
+ 'with-dir' => $with_dir,
);
}
if ($success) {