1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
|
diff --git a/lib/Iurt/Chroot.pm b/lib/Iurt/Chroot.pm
index ba87464..6e95dc0 100644
--- a/lib/Iurt/Chroot.pm
+++ b/lib/Iurt/Chroot.pm
@@ -300,23 +300,11 @@ sub check_chroot_need_update {
sub create_build_chroot {
my ($chroot, $chroot_ref, $run, $config) = @_;
- my $ret = 0;
if ($run->{storage} eq 'btrfs') {
- $ret = create_build_chroot_btrfs($chroot, $chroot_ref, $run, $config);
+ return create_build_chroot_btrfs($chroot, $chroot_ref, $run, $config);
} else {
- $ret = create_build_chroot_tar($chroot, $chroot_ref, $run, $config);
+ return create_build_chroot_tar($chroot, $chroot_ref, $run, $config);
}
-
- 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;
- }
- }
- }
- return $ret;
}
sub create_build_chroot_tar {
@@ -440,8 +428,11 @@ sub build_chroot {
}
# remove files used by --urpmi-root
- sudo($config, "--rm", "$tmp_chroot/etc/urpmi/urpmi.cfg");
- sudo($config, "--rm", "$tmp_chroot/var/lib/urpmi/*");
+ #if (!$urpmi->{use__urpmi_root} || $run->{chrooted_urpmi}) {
+ if (!($urpmi->{use__urpmi_root} && !$run->{chrooted_urpmi})) {
+ sudo($config, "--rm", "$tmp_chroot/etc/urpmi/urpmi.cfg");
+ sudo($config, "--rm", "$tmp_chroot/var/lib/urpmi/*");
+ }
# rpm is not running as root and cannot directly write to $tmp_chroot/var/log/qa
system("rpm -qa --root $tmp_chroot --qf '\%{NAME}-\%{VERSION}-\%{RELEASE}.\%{ARCH}\n' | sort > $tmp_chroot/tmp/qa");
|
