diff options
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | lib/Iurt/Urpmi.pm | 12 |
2 files changed, 7 insertions, 6 deletions
@@ -1,4 +1,5 @@ - iurt: also use --urpmi-root for urpmi.addmedia +- iurt: always use --root or --urpmi-root, not plain chroot to call urpmi 0.7.0 - iurt: support resuming a full rebuild diff --git a/lib/Iurt/Urpmi.pm b/lib/Iurt/Urpmi.pm index 401ae91..ff702bd 100644 --- a/lib/Iurt/Urpmi.pm +++ b/lib/Iurt/Urpmi.pm @@ -38,7 +38,12 @@ sub new { sub set_command { my ($self, $_chroot_tmp) = @_; - $self->{use__urpmi_root} ? &set_command__urpmi_root : &set_command__use_distrib; + 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) = @_; @@ -50,10 +55,6 @@ sub set_command__use_distrib { $self->{use_iurt_root_command} = 1; $self->{urpmi_command} = "urpmi $self->{urpmi_options} --use-distrib $self->{distrib_url} --root $chroot_tmp"; } -sub set_command__chrooted { - my ($self, $chroot_tmp) = @_; - $self->{urpmi_command} = "chroot $chroot_tmp urpmi $self->{urpmi_options} "; -} sub set_local_media { my ($self, $local_media) = @_; @@ -164,7 +165,6 @@ sub urpmi_command { add_media($self, $chroot_tmp, 'iurt_group', "iurt_group file:///iurt_media") or next; } - $self->set_command__chrooted($chroot_tmp); return 1; } else { $self->set_command($chroot_tmp); |