summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2006-01-11 11:06:20 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2006-01-11 11:06:20 +0000
commitd75279db49ca12cf10d930a7e7b6185ca1e1e04b (patch)
tree63a6d9af2a05879d8c88fbdf67790f7553d1edf7
parent0ceba028e5dcd75c83b01d17fa26c873919fc64a (diff)
downloadurpmi-d75279db49ca12cf10d930a7e7b6185ca1e1e04b.tar
urpmi-d75279db49ca12cf10d930a7e7b6185ca1e1e04b.tar.gz
urpmi-d75279db49ca12cf10d930a7e7b6185ca1e1e04b.tar.bz2
urpmi-d75279db49ca12cf10d930a7e7b6185ca1e1e04b.tar.xz
urpmi-d75279db49ca12cf10d930a7e7b6185ca1e1e04b.zip
Document --nolock
-rw-r--r--pod/urpmi.8.pod5
-rwxr-xr-xurpmi1
2 files changed, 6 insertions, 0 deletions
diff --git a/pod/urpmi.8.pod b/pod/urpmi.8.pod
index b696268c..d9b91c8c 100644
--- a/pod/urpmi.8.pod
+++ b/pod/urpmi.8.pod
@@ -286,6 +286,11 @@ F</etc/urpmi/skip.list> (see urpmi.files(5)).
When several packages are found, propose more choices than the default.
+=item B<--nolock>
+
+Don't lock urpmi and rpm db. This can be useful in conjunction with
+B<--root>.
+
=item B<--norebuild>
Don't try to rebuild the hdlist files from the RPMs if the original hdlist
diff --git a/urpmi b/urpmi
index 985b494d..6c451e2d 100755
--- a/urpmi
+++ b/urpmi
@@ -134,6 +134,7 @@ usage:
") . N(" --more-choices - when several packages are found, propose more choices
than the default.
") . N(" --norebuild - don't try to rebuild hdlist if not readable.
+") . N(" --nolock - don't lock rpm db.
") . N(" --strict-arch - upgrade only packages with the same architecture.
") . N(" -a - select all matches on command line.
") . N(" -p - allow search in provides to find package.