From d0d6c8c6a2e3829dd20d9e591dc6ec138ce7dec1 Mon Sep 17 00:00:00 2001 From: Pascal Terjan Date: Mon, 15 Jun 2020 21:08:26 +0000 Subject: Revert "Move updating the chroot to the right place" This reverts commit fe9d5b05cada63b4aa30b71401456263a3b511f1. It actually made things worse, this code is really a maze. --- lib/Iurt/Chroot.pm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/Iurt/Chroot.pm b/lib/Iurt/Chroot.pm index 86ada27..f0cf512 100644 --- a/lib/Iurt/Chroot.pm +++ b/lib/Iurt/Chroot.pm @@ -102,6 +102,11 @@ sub clean_and_build_chroot { } } + # We may have media not used to create the chroot (when building for updates_testing + # or if using additional_media) so need to update basesystem packages. + my $urpmi = $run->{urpmi}; + $urpmi->update($chroot); + 1; } @@ -317,11 +322,6 @@ sub create_build_chroot { } } - # We may have media not used to create the chroot (when building for updates_testing - # or if using additional_media) so need to update basesystem packages. - my $urpmi = $run->{urpmi}; - $urpmi->update($chroot); - if ($ret && $use_netns) { sudo($config, '--netns_create', $chroot); } -- cgit v1.2.1