diff options
author | Rafael Garcia-Suarez <rgarciasuarez@mandriva.org> | 2006-01-11 11:21:12 +0000 |
---|---|---|
committer | Rafael Garcia-Suarez <rgarciasuarez@mandriva.org> | 2006-01-11 11:21:12 +0000 |
commit | 5d200f30717d2a7115077373a4947ccf049590be (patch) | |
tree | cf3a5f75430dbb5bf1d2f7799706db641eaff573 | |
parent | ac600f5416fa4b85d206fbb3eac1ba6a2ee21a5e (diff) | |
download | urpmi-5d200f30717d2a7115077373a4947ccf049590be.tar urpmi-5d200f30717d2a7115077373a4947ccf049590be.tar.gz urpmi-5d200f30717d2a7115077373a4947ccf049590be.tar.bz2 urpmi-5d200f30717d2a7115077373a4947ccf049590be.tar.xz urpmi-5d200f30717d2a7115077373a4947ccf049590be.zip |
Allow --nolock in restricted mode
-rw-r--r-- | pod/rurpmi.8.pod | 2 | ||||
-rwxr-xr-x | urpmi | 2 |
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. @@ -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}{$_}; } |