summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-08-28 15:34:23 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-08-28 15:34:23 +0000
commit2aaf8f95f80c3afc3c56d46d68f04ffafd937909 (patch)
tree78e5a8ec04358396d6356e70a289c04bc1846e11
parentdd01cc1b004b870ed34b733717b9b4955a7cf3fc (diff)
downloadurpmi-2aaf8f95f80c3afc3c56d46d68f04ffafd937909.tar
urpmi-2aaf8f95f80c3afc3c56d46d68f04ffafd937909.tar.gz
urpmi-2aaf8f95f80c3afc3c56d46d68f04ffafd937909.tar.bz2
urpmi-2aaf8f95f80c3afc3c56d46d68f04ffafd937909.tar.xz
urpmi-2aaf8f95f80c3afc3c56d46d68f04ffafd937909.zip
- urpmi.addmedia
o instead of discarding --update when using --distrib, give it a meaning: only add media flagged "update"
-rw-r--r--NEWS3
-rw-r--r--pod/urpmi.addmedia.8.pod2
-rwxr-xr-xurpmi.addmedia5
3 files changed, 8 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index f6136942..00b7a487 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,9 @@
- urpmi
o do not write useless "foo (obsoletes foo-xxx)" in
installed-through-deps.list (#42167)
+- urpmi.addmedia
+ o instead of discarding --update when using --distrib, give it a meaning:
+ only add media flagged "update"
Version 6.4 - 14 August 2008, Thierry Vignaud
diff --git a/pod/urpmi.addmedia.8.pod b/pod/urpmi.addmedia.8.pod
index 60bcbde2..c4a4f5b2 100644
--- a/pod/urpmi.addmedia.8.pod
+++ b/pod/urpmi.addmedia.8.pod
@@ -126,6 +126,8 @@ username and a password.
Adds a media which will be taken into account by B<MandrivaUpdate> or by
C<urpmi --update> when looking for updates.
+If used together with B<--distrib>, it will only add media flagged "update".
+
=item B<--xml-info>
Use the specific policy for downloading xml info files.
diff --git a/urpmi.addmedia b/urpmi.addmedia
index 1678e9c5..0c6c9d48 100755
--- a/urpmi.addmedia
+++ b/urpmi.addmedia
@@ -62,7 +62,8 @@ and [options] are from
to be 1080 by default (format is <proxyhost[:port]>).
") . N(" --proxy-user - specify user and password to use for proxy
authentication (format is <user:password>).
-") . N(" --update - create an update medium.
+") . N(" --update - create an update medium,
+ or discard non-update media (when used with --distrib)
") . N(" --xml-info - use the specific policy for downloading xml info files
one of: never, on-demand, update-only, always. cf urpmi.cfg(5)
") . N(" --probe-synthesis - use synthesis file.
@@ -153,7 +154,7 @@ if ($options{distrib}) {
$url,
mirrorlist => $options{mirrorlist},
virtual => $options{virtual},
- update => $options{update},
+ only_updates => $options{update},
probe_with => $options{probe_with},
nolock => $options{nolock},
ask_media => $add_media_callback,