summaryrefslogtreecommitdiffstats
path: root/pod
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-08-11 16:25:18 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-08-11 16:25:18 +0000
commit57ce115d84224fe8dd75f19490f788fe8acf198c (patch)
treeb66cbe8793ca5291d0e7ea7f73bba593296fe949 /pod
parentf0c0ba3c176af4afd6659f532541043c7143e0e8 (diff)
downloadurpmi-57ce115d84224fe8dd75f19490f788fe8acf198c.tar
urpmi-57ce115d84224fe8dd75f19490f788fe8acf198c.tar.gz
urpmi-57ce115d84224fe8dd75f19490f788fe8acf198c.tar.bz2
urpmi-57ce115d84224fe8dd75f19490f788fe8acf198c.tar.xz
urpmi-57ce115d84224fe8dd75f19490f788fe8acf198c.zip
- urpmi
o handle preferred choices (through --prefer, /etc/urpmi/prefer.list and /etc/urpmi/prefer.vendor.list)
Diffstat (limited to 'pod')
-rw-r--r--pod/urpmi.8.pod7
-rw-r--r--pod/urpmi.files.5.pod11
-rw-r--r--pod/urpmq.8.pod13
3 files changed, 31 insertions, 0 deletions
diff --git a/pod/urpmi.8.pod b/pod/urpmi.8.pod
index a166ddad..a4fef950 100644
--- a/pod/urpmi.8.pod
+++ b/pod/urpmi.8.pod
@@ -359,6 +359,13 @@ You can specify a list of packages which installation should be skipped.
You can also include patterns between //, just like in
F</etc/urpmi/skip.list> (see urpmi.files(5)).
+=item B<--prefer> I<pattern,...>
+
+You can specify a list of packages which installation should be preferred
+(especially useful with B<--auto>).
+You can also include patterns between //, just like in
+F</etc/urpmi/prefer.list> (see urpmi.files(5)).
+
=item B<--more-choices>
When several packages are found, propose more choices than the default.
diff --git a/pod/urpmi.files.5.pod b/pod/urpmi.files.5.pod
index 623ba8bf..502c2703 100644
--- a/pod/urpmi.files.5.pod
+++ b/pod/urpmi.files.5.pod
@@ -69,6 +69,17 @@ the full name of the package, which has the form B<name-version-release.arch>.)
The list of packages that should be installed instead of updated. It has
the same format as the skip.list.
+=item I</etc/urpmi/prefer.list>
+
+The list of packages that should be preferred (useful for choices with
+B<--auto>). It contains one package expression per line; either a package
+name, or a regular expression (if enclosed in slashes B</>) to match the name
+of packages against.
+
+=item I</etc/urpmi/prefer.vendor.list>
+
+Vendor specific version of similar to prefer.list.
+
=item I</etc/urpmi/mirror.config>
This file is optional. If present, it should contain a single line:
diff --git a/pod/urpmq.8.pod b/pod/urpmq.8.pod
index 6557cd17..aba3dbfc 100644
--- a/pod/urpmq.8.pod
+++ b/pod/urpmq.8.pod
@@ -186,6 +186,19 @@ Use hdlist file (to use with --use-distrib).
Use a different environment directly from a bug report to replay a bug.
The argument is the same argument given to B<--bug> option.
+=item B<--skip> I<pattern,...>
+
+You can specify a list of packages which installation should be skipped.
+You can also include patterns between //, just like in
+F</etc/urpmi/skip.list> (see urpmi.files(5)).
+
+=item B<--prefer> I<pattern,...>
+
+You can specify a list of packages which installation should be preferred
+(especially useful with B<--auto>).
+You can also include patterns between //, just like in
+F</etc/urpmi/prefer.list> (see urpmi.files(5)).
+
=item B<--wait-lock>
If the urpmi or rpm db is busy, wait until it is available