summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--pod/rurpmi.8.pod2
-rwxr-xr-xurpmi2
2 files changed, 2 insertions, 2 deletions
diff --git a/pod/rurpmi.8.pod b/pod/rurpmi.8.pod
index 79563b04..68f28fdb 100644
--- a/pod/rurpmi.8.pod
+++ b/pod/rurpmi.8.pod
@@ -15,7 +15,7 @@ on it, preventing any abuse of this tool to compromise the system.
With rurpmi, you can't install arbitrary rpm files; moreoever the
B<--keep>, B<--verify-rpm>, and B<--norebuild> options are forced, and
several dangerous options are forbidden (B<--root>, B<--use-distrib>,
-B<--env>, B<--nolock>, B<--allow-nodeps>, B<--allow-force>, B<--force>,
+B<--env>, B<--allow-nodeps>, B<--allow-force>, B<--force>,
B<--auto-update>). Also, you won't be able to install rpms with bad
signatures.
diff --git a/urpmi b/urpmi
index 0ce07c6d..8f0af639 100755
--- a/urpmi
+++ b/urpmi
@@ -205,7 +205,7 @@ if ($restricted) {
#- force some options
foreach (qw(keep verify-rpm norebuild)) { $urpm->{options}{$_} = 1 }
#- forbid some other options
- urpm::error_restricted($urpm) if $root || $usedistrib || $force || $env || $parallel || $synthesis || $nolock || $auto_update;
+ urpm::error_restricted($urpm) if $root || $usedistrib || $force || $env || $parallel || $synthesis || $auto_update;
foreach (qw(allow-nodeps allow-force curl-options rsync-options wget-options)) {
urpm::error_restricted($urpm) if $urpm->{options}{$_};
}