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
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
|
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
<HEAD>
<TITLE> [Mageia-sysadm] [154] factorize chroot rebuild code
</TITLE>
<LINK REL="Index" HREF="index.html" >
<LINK REL="made" HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B154%5D%20factorize%20chroot%20rebuild%20code&In-Reply-To=%3C20101125234352.BDED13FB18%40valstar.mageia.org%3E">
<META NAME="robots" CONTENT="index,nofollow">
<META http-equiv="Content-Type" content="text/html; charset=us-ascii">
<LINK REL="Previous" HREF="000957.html">
<LINK REL="Next" HREF="000959.html">
</HEAD>
<BODY BGCOLOR="#ffffff">
<H1>[Mageia-sysadm] [154] factorize chroot rebuild code</H1>
<B>root at mageia.org</B>
<A HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B154%5D%20factorize%20chroot%20rebuild%20code&In-Reply-To=%3C20101125234352.BDED13FB18%40valstar.mageia.org%3E"
TITLE="[Mageia-sysadm] [154] factorize chroot rebuild code">root at mageia.org
</A><BR>
<I>Fri Nov 26 00:43:52 CET 2010</I>
<P><UL>
<LI>Previous message: <A HREF="000957.html">[Mageia-sysadm] [153] fix case
</A></li>
<LI>Next message: <A HREF="000959.html">[Mageia-sysadm] [155] fix indentation
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#958">[ date ]</a>
<a href="thread.html#958">[ thread ]</a>
<a href="subject.html#958">[ subject ]</a>
<a href="author.html#958">[ author ]</a>
</LI>
</UL>
<HR>
<!--beginarticle-->
<PRE>Revision: 154
Author: blino
Date: 2010-11-26 00:43:52 +0100 (Fri, 26 Nov 2010)
Log Message:
-----------
factorize chroot rebuild code
Modified Paths:
--------------
build_system/iurt/trunk/lib/Iurt/Chroot.pm
Modified: build_system/iurt/trunk/lib/Iurt/Chroot.pm
===================================================================
--- build_system/iurt/trunk/lib/Iurt/Chroot.pm 2010-11-25 23:41:13 UTC (rev 153)
+++ build_system/iurt/trunk/lib/Iurt/Chroot.pm 2010-11-25 23:43:52 UTC (rev 154)
@@ -429,12 +429,6 @@
if (!-f $chroot_tar) {
plog("rebuild chroot tarball");
$rebuild = 1;
- if (!build_chroot($run, $config, $tmp_chroot, $chroot_tar, $opt)) {
- plog('NOTIFY', "creating chroot failed.");
- $clean->();
- sudo($run, $config, '--rm', '-r', $chroot, $chroot_tar);
- return;
- }
} else {
link $chroot_tar, $tmp_tar or die "FATAL: could not initialize chroot ($!)\n";
@@ -451,14 +445,7 @@
if (@removed_pkgs) {
plog('DEBUG', "changed packages: @removed_pkgs");
plog('NOTIFY', "Rebuilding chroot tarball");
-
$rebuild = 1;
- sudo($run, $config, '--rm', '-r', $tmp_chroot);
- if (!build_chroot($run, $config, $tmp_chroot, $chroot_tar, $opt)) {
- plog('NOTIFY', "creating chroot failed.");
- $clean->();
- return;
- }
} else {
plog('NOTIFY', "chroot tarball is already up-to-date");
link $tmp_tar, $chroot_tar;
@@ -466,15 +453,19 @@
} else {
plog('DEBUG', "can't open $tmp_chroot/var/log/qa");
plog('ERR', "can't check chroot, recreating");
-
- if (!build_chroot($run, $config, $tmp_chroot, $chroot_tar, $opt)) {
- plog('NOTIFY', "creating chroot failed.");
- $clean->();
- return;
- }
+ $rebuild = 1;
}
}
+ if ($rebuild) {
+ if (!build_chroot($run, $config, $tmp_chroot, $chroot_tar, $opt)) {
+ plog('NOTIFY', "creating chroot failed.");
+ $clean->();
+ sudo($run, $config, '--rm', '-r', $chroot, $chroot_tar);
+ return;
+ }
+ }
+
if (!-d $chroot || $rebuild) {
plog('DEBUG', "recreate chroot $chroot");
plog('NOTIFY', "recreate chroot");
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/mageia-sysadm/attachments/20101126/bc8587b1/attachment-0001.html>
</PRE>
<!--endarticle-->
<HR>
<P><UL>
<!--threads-->
<LI>Previous message: <A HREF="000957.html">[Mageia-sysadm] [153] fix case
</A></li>
<LI>Next message: <A HREF="000959.html">[Mageia-sysadm] [155] fix indentation
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#958">[ date ]</a>
<a href="thread.html#958">[ thread ]</a>
<a href="subject.html#958">[ subject ]</a>
<a href="author.html#958">[ author ]</a>
</LI>
</UL>
<hr>
<a href="https://www.mageia.org/mailman/listinfo/mageia-sysadm">More information about the Mageia-sysadm
mailing list</a><br>
</body></html>
|
