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
|
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
<HEAD>
<TITLE> [Mageia-sysadm] [151] simplify
</TITLE>
<LINK REL="Index" HREF="index.html" >
<LINK REL="made" HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B151%5D%20simplify&In-Reply-To=%3C20101125233257.6B17D3FB18%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="000954.html">
<LINK REL="Next" HREF="000956.html">
</HEAD>
<BODY BGCOLOR="#ffffff">
<H1>[Mageia-sysadm] [151] simplify</H1>
<B>root at mageia.org</B>
<A HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B151%5D%20simplify&In-Reply-To=%3C20101125233257.6B17D3FB18%40valstar.mageia.org%3E"
TITLE="[Mageia-sysadm] [151] simplify">root at mageia.org
</A><BR>
<I>Fri Nov 26 00:32:57 CET 2010</I>
<P><UL>
<LI>Previous message: <A HREF="000954.html">[Mageia-sysadm] [150] create tmp_chroot in one place only
</A></li>
<LI>Next message: <A HREF="000956.html">[Mageia-sysadm] [152] linking back the chroot tarball is only needed when not rebuilding the chroot
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#955">[ date ]</a>
<a href="thread.html#955">[ thread ]</a>
<a href="subject.html#955">[ subject ]</a>
<a href="author.html#955">[ author ]</a>
</LI>
</UL>
<HR>
<!--beginarticle-->
<PRE>Revision: 151
Author: blino
Date: 2010-11-26 00:32:57 +0100 (Fri, 26 Nov 2010)
Log Message:
-----------
simplify
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:27:06 UTC (rev 150)
+++ build_system/iurt/trunk/lib/Iurt/Chroot.pm 2010-11-25 23:32:57 UTC (rev 151)
@@ -425,7 +425,6 @@
plog('NOTIFY', "creating chroot");
plog('DEBUG', "... with packages " . join(', ', @{$opt->{packages}}));
- if (!-f $chroot_tar || link $chroot_tar, $tmp_tar) {
mkdir_p($tmp_chroot);
if (!-f $chroot_tar) {
plog("rebuild chroot tarball");
@@ -437,6 +436,8 @@
return;
}
} else {
+ link $chroot_tar, $tmp_tar or die "FATAL: could not initialize chroot ($!)\n";
+
plog('DEBUG', "decompressing /var/log/qa from $chroot_tar in $tmp_chroot");
sudo($run, $config, '--untar', $chroot_tar, $tmp_chroot, "./var/log/qa");
@@ -473,9 +474,6 @@
}
}
link $tmp_tar, $chroot_tar;
- } else {
- die "FATAL: could not initialize chroot ($!)\n";
- }
if (!-d $chroot || $rebuild) {
plog('DEBUG', "recreate chroot $chroot");
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/mageia-sysadm/attachments/20101126/99f7a2a6/attachment.html>
</PRE>
<!--endarticle-->
<HR>
<P><UL>
<!--threads-->
<LI>Previous message: <A HREF="000954.html">[Mageia-sysadm] [150] create tmp_chroot in one place only
</A></li>
<LI>Next message: <A HREF="000956.html">[Mageia-sysadm] [152] linking back the chroot tarball is only needed when not rebuilding the chroot
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#955">[ date ]</a>
<a href="thread.html#955">[ thread ]</a>
<a href="subject.html#955">[ subject ]</a>
<a href="author.html#955">[ 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>
|
