aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mageia.org>2020-06-15 21:08:26 +0000
committerPascal Terjan <pterjan@mageia.org>2020-06-15 21:10:30 +0000
commitd0d6c8c6a2e3829dd20d9e591dc6ec138ce7dec1 (patch)
treefa024c4b58174f10e6edac68dc155df067f1f1a8
parent1bb20c3482448f71762f47d4173cb1642d056cdf (diff)
downloadiurt-d0d6c8c6a2e3829dd20d9e591dc6ec138ce7dec1.tar
iurt-d0d6c8c6a2e3829dd20d9e591dc6ec138ce7dec1.tar.gz
iurt-d0d6c8c6a2e3829dd20d9e591dc6ec138ce7dec1.tar.bz2
iurt-d0d6c8c6a2e3829dd20d9e591dc6ec138ce7dec1.tar.xz
iurt-d0d6c8c6a2e3829dd20d9e591dc6ec138ce7dec1.zip
Revert "Move updating the chroot to the right place"
This reverts commit fe9d5b05cada63b4aa30b71401456263a3b511f1. It actually made things worse, this code is really a maze.
-rw-r--r--lib/Iurt/Chroot.pm10
1 files 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);
}