summaryrefslogtreecommitdiffstats
path: root/urpm.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2006-11-20 08:55:32 +0000
committerPascal Rigaux <pixel@mandriva.com>2006-11-20 08:55:32 +0000
commit6a25c6c1a8ffc96a0ca4a31757ebfc2d116cd006 (patch)
tree1f1ccb3dfaa17803bc2cc7de3aadb21d782e89bc /urpm.pm
parentc2fe4131c0d8139bda966785f063e1bbed43e8eb (diff)
downloadurpmi-6a25c6c1a8ffc96a0ca4a31757ebfc2d116cd006.tar
urpmi-6a25c6c1a8ffc96a0ca4a31757ebfc2d116cd006.tar.gz
urpmi-6a25c6c1a8ffc96a0ca4a31757ebfc2d116cd006.tar.bz2
urpmi-6a25c6c1a8ffc96a0ca4a31757ebfc2d116cd006.tar.xz
urpmi-6a25c6c1a8ffc96a0ca4a31757ebfc2d116cd006.zip
- {nodepslist} now implies {no_skiplist}
- drop {noinstalling}, use {nodepslist} instead (since {noinstalling} is only used when {nodepslist} is set)
Diffstat (limited to 'urpm.pm')
-rw-r--r--urpm.pm7
1 files changed, 3 insertions, 4 deletions
diff --git a/urpm.pm b/urpm.pm
index dc2e56fc..7bd39fb7 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -577,8 +577,7 @@ sub _configure_parallel {
#- media
#- need_hdlist (for urpmf: to be able to have info not available in synthesis)
#- nodepslist
-#- noinstalling
-#- no_skiplist (urpmf & urpmq)
+#- no_skiplist (urpmf)
#- parallel
#- root
#- searchmedia
@@ -712,7 +711,7 @@ sub configure {
}
}
#- determine package to withdraw (from skip.list file) only if something should be withdrawn.
- unless ($options{no_skiplist}) {
+ unless ($options{nodepslist} || $options{no_skiplist}) {
my %uniq;
$urpm->compute_flags(
get_packages_list($urpm->{skiplist}, $options{skip}),
@@ -725,7 +724,7 @@ sub configure {
},
);
}
- unless ($options{noinstalling}) {
+ unless ($options{nodepslist}) {
my %uniq;
$urpm->compute_flags(
get_packages_list($urpm->{instlist}),