blob: c1eda4b20848f7aa158ff296ad218f839896ac7b (
plain)
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
|
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
<HEAD>
<TITLE> [Mageia-sysadm] [122] apply patch from blino to use config file from /etc/iurt
</TITLE>
<LINK REL="Index" HREF="index.html" >
<LINK REL="made" HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B122%5D%20apply%20patch%20from%20blino%20to%20use%20config%20file%0A%09from%20/etc/iurt&In-Reply-To=%3C20101110125850.731973F908%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="000461.html">
<LINK REL="Next" HREF="000467.html">
</HEAD>
<BODY BGCOLOR="#ffffff">
<H1>[Mageia-sysadm] [122] apply patch from blino to use config file from /etc/iurt</H1>
<B>root at mageia.org</B>
<A HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B122%5D%20apply%20patch%20from%20blino%20to%20use%20config%20file%0A%09from%20/etc/iurt&In-Reply-To=%3C20101110125850.731973F908%40valstar.mageia.org%3E"
TITLE="[Mageia-sysadm] [122] apply patch from blino to use config file from /etc/iurt">root at mageia.org
</A><BR>
<I>Wed Nov 10 13:58:50 CET 2010</I>
<P><UL>
<LI>Previous message: <A HREF="000461.html">[Mageia-sysadm] Puppet Report for valstar.mageia.org
</A></li>
<LI>Next message: <A HREF="000467.html">[Mageia-sysadm] [231] Add mysql
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#464">[ date ]</a>
<a href="thread.html#464">[ thread ]</a>
<a href="subject.html#464">[ subject ]</a>
<a href="author.html#464">[ author ]</a>
</LI>
</UL>
<HR>
<!--beginarticle-->
<PRE>Revision: 122
Author: boklm
Date: 2010-11-10 13:58:50 +0100 (Wed, 10 Nov 2010)
Log Message:
-----------
apply patch from blino to use config file from /etc/iurt
Modified Paths:
--------------
build_system/iurt/trunk/iurt2
Modified: build_system/iurt/trunk/iurt2
===================================================================
--- build_system/iurt/trunk/iurt2 2010-11-08 15:30:29 UTC (rev 121)
+++ build_system/iurt/trunk/iurt2 2010-11-10 12:58:50 UTC (rev 122)
@@ -388,14 +388,16 @@
chomp $real_arch;
my $HOME = $ENV{HOME};
my $configfile = "$HOME/.iurt.$run{distro_tag}.conf";
+my $sysconfigfile = "/etc/iurt/$run{distro_tag}.conf";
-plog('DEBUG', "load config: $configfile");
-my $config;
-if (-f $configfile) {
- $config = eval(cat_($configfile))
- or die "FATAL $program_name: syntax error in $configfile";
-} else {
- $config = {};
+my $config = {};
+foreach my $f ($configfile, $sysconfigfile) {
+ plog('DEBUG', "load config: $f");
+ if (-f $f) {
+ $config = eval(cat_($f))
+ or die "FATAL $program_name: syntax error in $f";
+ last;
+ }
}
if ($run{repository}) {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/mageia-sysadm/attachments/20101110/6bad3d22/attachment-0001.html>
</PRE>
<!--endarticle-->
<HR>
<P><UL>
<!--threads-->
<LI>Previous message: <A HREF="000461.html">[Mageia-sysadm] Puppet Report for valstar.mageia.org
</A></li>
<LI>Next message: <A HREF="000467.html">[Mageia-sysadm] [231] Add mysql
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#464">[ date ]</a>
<a href="thread.html#464">[ thread ]</a>
<a href="subject.html#464">[ subject ]</a>
<a href="author.html#464">[ 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>
|
