From fe9d5b05cada63b4aa30b71401456263a3b511f1 Mon Sep 17 00:00:00 2001 From: Pascal Terjan Date: Mon, 15 Jun 2020 18:40:39 +0000 Subject: Move updating the chroot to the right place --- NEWS | 2 ++ lib/Iurt/Chroot.pm | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/NEWS b/NEWS index 80ad55b..f1e2d6e 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,5 @@ +- iurt: update packages after adding media rather than before + 0.7.11 - iurt: allow building arm v5 and v7 on armv8l - ulri: sort file names in mail diff --git a/lib/Iurt/Chroot.pm b/lib/Iurt/Chroot.pm index f0cf512..86ada27 100644 --- a/lib/Iurt/Chroot.pm +++ b/lib/Iurt/Chroot.pm @@ -102,11 +102,6 @@ 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; } @@ -322,6 +317,11 @@ 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