aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mageia.org>2020-06-15 21:19:23 +0000
committerPascal Terjan <pterjan@mageia.org>2020-06-15 21:20:01 +0000
commite801a2771cabad3872479e75c83b439d3825b944 (patch)
treef788821b9bf884b32d2ea708fdb8c27ddb5ced29
parentd0d6c8c6a2e3829dd20d9e591dc6ec138ce7dec1 (diff)
downloadiurt-e801a2771cabad3872479e75c83b439d3825b944.tar
iurt-e801a2771cabad3872479e75c83b439d3825b944.tar.gz
iurt-e801a2771cabad3872479e75c83b439d3825b944.tar.bz2
iurt-e801a2771cabad3872479e75c83b439d3825b944.tar.xz
iurt-e801a2771cabad3872479e75c83b439d3825b944.zip
Move the updating of packages later
The creation of chroot is a mess with various retries, so do it as late as possible when there is no way something gets changed again.
-rw-r--r--NEWS2
-rwxr-xr-xiurt4
-rw-r--r--lib/Iurt/Chroot.pm5
3 files changed, 6 insertions, 5 deletions
diff --git a/NEWS b/NEWS
index 20d435b..20164fe 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- iurt: try again updating packages later
+
0.7.12
- iurt: update packages after adding media rather than before
diff --git a/iurt b/iurt
index 3143375..72ad823 100755
--- a/iurt
+++ b/iurt
@@ -784,6 +784,10 @@ retry:
mkdir $log_dir;
-d $log_dir or die "FATAL: could not create $log_dir (check permissions and group ownerships)";
+ # 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.
+ $urpmi->update($chroot);
+
plog('INFO', "Install build dependencies for $srpm");
my $path_srpm = "$chroot_tmp/home/$luser/rpmbuild/SRPMS/";
diff --git a/lib/Iurt/Chroot.pm b/lib/Iurt/Chroot.pm
index f0cf512..85b06c4 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;
}