From 6a25c6c1a8ffc96a0ca4a31757ebfc2d116cd006 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Mon, 20 Nov 2006 08:55:32 +0000
Subject: - {nodepslist} now implies {no_skiplist} - drop {noinstalling}, use
 {nodepslist} instead   (since {noinstalling} is only used when {nodepslist}
 is set)

---
 urpm.pm | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'urpm.pm')

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}),
-- 
cgit v1.2.1