summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-06-29 02:57:01 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-06-29 02:57:01 +0000
commitd6ad7abbebca2c7b2b4fd17547ddd85ae1c3e4c2 (patch)
tree534d871daae7304ad70c4247c27c01536b28b0f4
parentacf4d7805b5be2d13d1f47c577d5cf0e3f462e72 (diff)
downloadurpmi-d6ad7abbebca2c7b2b4fd17547ddd85ae1c3e4c2.tar
urpmi-d6ad7abbebca2c7b2b4fd17547ddd85ae1c3e4c2.tar.gz
urpmi-d6ad7abbebca2c7b2b4fd17547ddd85ae1c3e4c2.tar.bz2
urpmi-d6ad7abbebca2c7b2b4fd17547ddd85ae1c3e4c2.tar.xz
urpmi-d6ad7abbebca2c7b2b4fd17547ddd85ae1c3e4c2.zip
More restricted checks
-rwxr-xr-xurpmi6
1 files changed, 3 insertions, 3 deletions
diff --git a/urpmi b/urpmi
index 52aa1fd2..5ffe3d48 100755
--- a/urpmi
+++ b/urpmi
@@ -189,10 +189,10 @@ if ($install_src) {
if ($restricted) {
urpm::error_restricted($urpm) if @src_files || @files;
#- force some options
- $urpm->{options}{keep} = 1;
- $urpm->{options}{'verify-rpm'} = 1;
+ foreach (qw(keep verify-rpm norebuild)) { $urpm->{options}{$_} = 1 }
#- forbid some other options
- urpm::error_restricted($urpm) if $::root || $::usedistrib || $::force || $::env || $::parallel;
+ urpm::error_restricted($urpm) if $root || $usedistrib || $force || $env || $parallel || $synthesis || $nolock;
+ urpm::error_restricted($urpm) if exists $urpm->{options}{'priority-upgrade'};
foreach (qw(allow-nodeps allow-force)) { urpm::error_restricted($urpm) if $urpm->{options}{$_} }
}