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
|
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
<HEAD>
<TITLE> [Mageia-sysadm] [278] fail early if chroot creation fails ( if some suggests have unsatisfied
</TITLE>
<LINK REL="Index" HREF="index.html" >
<LINK REL="made" HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B278%5D%20fail%20early%20if%20chroot%20creation%20fails%20%28%20if%20some%0A%20suggests%20have%20unsatisfied&In-Reply-To=%3C20110113124021.6E7394232A%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="002015.html">
<LINK REL="Next" HREF="002017.html">
</HEAD>
<BODY BGCOLOR="#ffffff">
<H1>[Mageia-sysadm] [278] fail early if chroot creation fails ( if some suggests have unsatisfied</H1>
<B>root at mageia.org</B>
<A HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B278%5D%20fail%20early%20if%20chroot%20creation%20fails%20%28%20if%20some%0A%20suggests%20have%20unsatisfied&In-Reply-To=%3C20110113124021.6E7394232A%40valstar.mageia.org%3E"
TITLE="[Mageia-sysadm] [278] fail early if chroot creation fails ( if some suggests have unsatisfied">root at mageia.org
</A><BR>
<I>Thu Jan 13 13:40:21 CET 2011</I>
<P><UL>
<LI>Previous message: <A HREF="002015.html">[Mageia-sysadm] Puppet Report for valstar.mageia.org
</A></li>
<LI>Next message: <A HREF="002017.html">[Mageia-sysadm] [279] add missing parentheses in open calls
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#2016">[ date ]</a>
<a href="thread.html#2016">[ thread ]</a>
<a href="subject.html#2016">[ subject ]</a>
<a href="author.html#2016">[ author ]</a>
</LI>
</UL>
<HR>
<!--beginarticle-->
<PRE>Revision: 278
Author: blino
Date: 2011-01-13 13:40:21 +0100 (Thu, 13 Jan 2011)
Log Message:
-----------
fail early if chroot creation fails (if some suggests have unsatisfied
deps, chroot creation will appear as failed in status log and make
ulri fail, but the chroot was still usable to build package, and the
whole build was marked as failed only after finishing the package rebuild)
this also removes duplicate check for /bin/rpm
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 2011-01-13 11:12:27 UTC (rev 277)
+++ build_system/iurt/trunk/lib/Iurt/Chroot.pm 2011-01-13 12:40:21 UTC (rev 278)
@@ -511,7 +511,7 @@
$urpmi->set_command($tmp_chroot);
# 20060826 warly urpmi --root does not work properly
- $urpmi->install_packages(
+ if (!$urpmi->install_packages(
"chroot",
$tmp_chroot,
$run->{local_spool},
@@ -520,11 +520,8 @@
"[ADMIN] creation of initial chroot failed on $run->{my_arch}",
{ maintainer => $config->{admin} },
@{$opt->{packages}}
- );
-
- # Yes, /usr/lib/rpm/rpmb even for x86_64
- if (! -f "$tmp_chroot/bin/rpm") {
- plog('ERROR', "Base packages missing in generated chroot.");
+ )) {
+ plog('ERROR', "Failed to install initial packages during chroot creation.");
return 0;
}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/mageia-sysadm/attachments/20110113/33d3fc58/attachment.html>
</PRE>
<!--endarticle-->
<HR>
<P><UL>
<!--threads-->
<LI>Previous message: <A HREF="002015.html">[Mageia-sysadm] Puppet Report for valstar.mageia.org
</A></li>
<LI>Next message: <A HREF="002017.html">[Mageia-sysadm] [279] add missing parentheses in open calls
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#2016">[ date ]</a>
<a href="thread.html#2016">[ thread ]</a>
<a href="subject.html#2016">[ subject ]</a>
<a href="author.html#2016">[ 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>
|
