diff options
| author | Pascal Terjan <pterjan@mageia.org> | 2020-11-29 22:39:05 +0000 |
|---|---|---|
| committer | Pascal Terjan <pterjan@mageia.org> | 2020-11-29 22:39:05 +0000 |
| commit | 8eec3c57d960494cef6939db304a45e72f19b58d (patch) | |
| tree | 9f00da7781dc996eb5cc0d93205637c4bd482f60 /lib/Iurt/Chroot.pm | |
| parent | 797b073cdfdd428a165a08e6ab40524061182612 (diff) | |
| download | iurt-8eec3c57d960494cef6939db304a45e72f19b58d.tar iurt-8eec3c57d960494cef6939db304a45e72f19b58d.tar.gz iurt-8eec3c57d960494cef6939db304a45e72f19b58d.tar.bz2 iurt-8eec3c57d960494cef6939db304a45e72f19b58d.tar.xz iurt-8eec3c57d960494cef6939db304a45e72f19b58d.zip | |
Always use urpmi --urpmi-root
Diffstat (limited to 'lib/Iurt/Chroot.pm')
| -rw-r--r-- | lib/Iurt/Chroot.pm | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/lib/Iurt/Chroot.pm b/lib/Iurt/Chroot.pm index 85b06c4..8d7fcd3 100644 --- a/lib/Iurt/Chroot.pm +++ b/lib/Iurt/Chroot.pm @@ -309,11 +309,9 @@ sub create_build_chroot { if ($ret) { my $urpmi = $run->{urpmi}; - if ($urpmi->{use__urpmi_root} && !$run->{chrooted_urpmi}) { - if (!$urpmi->add_media__urpmi_root($chroot, $config->{base_media})) { - plog('ERROR', "urpmi.addmedia --urpmi-root failed"); - return; - } + if (!$urpmi->add_media__urpmi_root($chroot, $config->{base_media})) { + plog('ERROR', "urpmi.addmedia --urpmi-root failed"); + return; } } @@ -412,16 +410,13 @@ sub build_chroot { # install chroot my $urpmi = $run->{urpmi}; # perl_checker: $urpmi = Iurt::Urpmi->new - if ($urpmi->{use__urpmi_root}) { - if (!$urpmi->add_media__urpmi_root($tmp_chroot, $config->{base_media})) { - plog('ERROR', "urpmi.addmedia --urpmi-root failed"); - return 0; - } - $urpmi->set_command__urpmi_root($tmp_chroot); - } else { - $urpmi->set_command__use_distrib($tmp_chroot); + if (!$urpmi->add_media__urpmi_root($tmp_chroot, $config->{base_media})) { + plog('ERROR', "urpmi.addmedia --urpmi-root failed"); + return 0; } + $urpmi->set_command($tmp_chroot); + # (blino) install meta-task first for prefer.vendor.list to be used foreach my $packages ([ 'meta-task' ], $config->{basesystem_packages}) { if (!$urpmi->install_packages( |