From 435d92f61744e346fe549006f39aef606333c7e7 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 17 Jan 2008 15:26:01 +0000
Subject: fix using urpmi --env where the media are virtual (by removing
 "virtual" from urpmi.cfg)

---
 urpmi | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/urpmi b/urpmi
index b3ecf84c..12c9647d 100755
--- a/urpmi
+++ b/urpmi
@@ -25,7 +25,7 @@ use urpm::args;
 use urpm::msg;
 use urpm::media;
 use urpm::select;
-use urpm::util qw(untaint difference2 member partition);
+use urpm::util qw(untaint difference2 member partition cat_);
 use urpm::main_loop;
 
 #URPM::setVerbosity(7);
@@ -249,6 +249,10 @@ if ($env) {
     print N("using specific environment on %s\n", $env);
     #- setting new environment.
     $urpm->{config} = "$env/urpmi.cfg";
+    if (cat_($urpm->{config}) =~ /^\s*virtual\s*$/m) {
+	print "dropping virtual from $urpm->{config}\n";
+	system(q(perl -pi -e 's/^\s*virtual\s*$//' ) . $urpm->{config});
+    }
     $urpm->{skiplist} = "$env/skip.list";
     $urpm->{instlist} = "$env/inst.list";
     $urpm->{prefer_list} = "$env/prefer.list";
-- 
cgit v1.2.1