diff options
| author | Pascal Terjan <pterjan@mageia.org> | 2017-10-03 23:54:28 +0100 |
|---|---|---|
| committer | Pascal Terjan <pterjan@mageia.org> | 2017-10-04 00:02:58 +0100 |
| commit | 0275644f46e2da4d80a01945ea43235018282349 (patch) | |
| tree | 0f5dda692d72dd4065093fa9b5301a519a9901fb | |
| parent | 2028e727013180581c6658cf02d539d45be7d56b (diff) | |
| download | iurt-0275644f46e2da4d80a01945ea43235018282349.tar iurt-0275644f46e2da4d80a01945ea43235018282349.tar.gz iurt-0275644f46e2da4d80a01945ea43235018282349.tar.bz2 iurt-0275644f46e2da4d80a01945ea43235018282349.tar.xz iurt-0275644f46e2da4d80a01945ea43235018282349.zip | |
Fix previous commit
| -rw-r--r-- | lib/Iurt/Urpmi.pm | 20 |
1 files 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; |