From 50bfacb9170146abf3c11332cf509734d117a91f Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Wed, 29 Nov 2006 15:46:25 +0000
Subject: directly set $urpm->{root}, it's simpler (also use it in
 urpm::get_pkgs::selected2list() even if callers didn't pass it)

---
 urpm/media.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'urpm/media.pm')

diff --git a/urpm/media.pm b/urpm/media.pm
index 217b6cd3..d2134128 100644
--- a/urpm/media.pm
+++ b/urpm/media.pm
@@ -442,7 +442,7 @@ sub write_config {
 
 #- read urpmi.cfg file as well as necessary synthesis files
 #- options :
-#-	root
+#-	root (deprecated, set directly $urpm->{root})
 #-	cmdline_skiplist
 #-      nocheck_access (used by read_config)
 #-
@@ -479,7 +479,7 @@ sub configure {
 	}
     } else {
 	#- nb: can't have both parallel and root
-	$urpm->{root} = $options{root};
+	$urpm->{root} = $options{root} if $options{root};
     }
 
     $urpm->{root} && ! -c "$urpm->{root}/dev/null"
-- 
cgit v1.2.1