From 0275644f46e2da4d80a01945ea43235018282349 Mon Sep 17 00:00:00 2001
From: Pascal Terjan <pterjan@mageia.org>
Date: Tue, 3 Oct 2017 23:54:28 +0100
Subject: Fix previous commit

---
 lib/Iurt/Urpmi.pm | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/lib/Iurt/Urpmi.pm b/lib/Iurt/Urpmi.pm
index ff702bd..837e858 100644
--- a/lib/Iurt/Urpmi.pm
+++ b/lib/Iurt/Urpmi.pm
@@ -36,15 +36,6 @@ sub new {
     $self;
 }
 
-sub set_command {
-    my ($self, $_chroot_tmp) = @_;
-    if ($run->{chrooted_urpmi}) {
-	# FIXME chrooted_urpmi should always use urpmi_root and not support local media
-	$self->{use__urpmi_root} ? &set_command__urpmi_root : &set_command__use_distrib;
-    } else {
-	&set_command__use_distrib;
-    }
-}
 sub set_command__urpmi_root {
     my ($self, $chroot_tmp) = @_;
     $self->{use_iurt_root_command} = 1;
@@ -75,7 +66,8 @@ sub urpmi_command {
     my $local_media = $self->{local_media};
 
     if ($run->{chrooted_urpmi}) { 
-	$self->set_command($chroot_tmp);
+	# FIXME chrooted_urpmi should always use urpmi_root and not support local media
+	$self->{use__urpmi_root} ? &set_command__urpmi_root : &set_command__use_distrib;
 
 # CM: commented out
 #     this was causing rpm database corruption problems and the packages
@@ -167,7 +159,7 @@ sub urpmi_command {
 
 	return 1;
     } else {
-	$self->set_command($chroot_tmp);
+	&set_command__use_distrib;
     }
 }
 
@@ -413,11 +405,7 @@ sub install_packages {
 
     plog('DEBUG', "installing @packages");
 
-    if ($run->{chrooted_urpmi}) {
-       	@to_install = map { s/$chroot_tmp//; $_ } @packages;
-    } else {
-	push @to_install, @packages;
-    }
+    push @to_install, @packages;
 
     @to_install or return 1;
 
-- 
cgit v1.2.1