summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-09-05 09:59:19 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-09-05 09:59:19 +0000
commite4f4901277e61cc1d651a03261b5c36a0468ee03 (patch)
tree149687cfd0d20130f40b47d48e16a9b7ac69cd82
parent69a8ae6b3cd30af6a75d7f03b9452596401d1b5c (diff)
downloadurpmi-e4f4901277e61cc1d651a03261b5c36a0468ee03.tar
urpmi-e4f4901277e61cc1d651a03261b5c36a0468ee03.tar.gz
urpmi-e4f4901277e61cc1d651a03261b5c36a0468ee03.tar.bz2
urpmi-e4f4901277e61cc1d651a03261b5c36a0468ee03.tar.xz
urpmi-e4f4901277e61cc1d651a03261b5c36a0468ee03.zip
- urpmi
o handle --searchmedia <media1>,...,<mediaN> (asked by tvignaud for rpmdrake)
-rw-r--r--NEWS1
-rw-r--r--pod/urpmi.8.pod2
-rw-r--r--urpm/media.pm2
3 files changed, 3 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index a63a86b6..1de8eac0 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,6 @@
- urpmi
o fix rpmdb locking with --root
+ o handle --searchmedia <media1>,...,<mediaN>
o do auto upgrade mandriva kernels (ie remove kernel*-latest to skip.list)
Version 4.10.6 - 28 August 2007, by Pascal "Pixel" Rigaux
diff --git a/pod/urpmi.8.pod b/pod/urpmi.8.pod
index fc138758..9743700d 100644
--- a/pod/urpmi.8.pod
+++ b/pod/urpmi.8.pod
@@ -69,7 +69,7 @@ No rpm will be fetched from other media.
Do not use the specified media.
-=item B<--searchmedia> I<media>
+=item B<--searchmedia> I<media1,...,mediaN>
Use only the specified media to search for packages that are specified on
the command-line, or which are found when using B<--auto-select>.
diff --git a/urpm/media.pm b/urpm/media.pm
index 7e94100a..cfc3ab8a 100644
--- a/urpm/media.pm
+++ b/urpm/media.pm
@@ -541,7 +541,7 @@ sub configure {
}
}
if ($options{searchmedia}) {
- foreach (select_media_by_name($urpm, [ $options{searchmedia} ])) {
+ foreach (select_media_by_name($urpm, [ split /,/, $options{searchmedia} ])) {
#- Ensure this media is selected
$_->{modified} = 1;
_tempignore($_, 0);