diff options
Diffstat (limited to 'zarb-ml/mageia-sysadm/2010-November/000849.html')
| -rw-r--r-- | zarb-ml/mageia-sysadm/2010-November/000849.html | 148 |
1 files changed, 148 insertions, 0 deletions
diff --git a/zarb-ml/mageia-sysadm/2010-November/000849.html b/zarb-ml/mageia-sysadm/2010-November/000849.html new file mode 100644 index 000000000..445f70daf --- /dev/null +++ b/zarb-ml/mageia-sysadm/2010-November/000849.html @@ -0,0 +1,148 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN"> +<HTML> + <HEAD> + <TITLE> [Mageia-sysadm] [126] use upload.conf from /etc/iurt if not in home ( could be factorized together and with iurt config file 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%5B126%5D%20use%20upload.conf%20from%20/etc/iurt%20if%20not%20in%20home%0A%20%28%20could%20be%20factorized%20together%20and%20with%20iurt%20config%20file%20code%29&In-Reply-To=%3C20101123215213.3C4003FCC8%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="000848.html"> + <LINK REL="Next" HREF="000850.html"> + </HEAD> + <BODY BGCOLOR="#ffffff"> + <H1>[Mageia-sysadm] [126] use upload.conf from /etc/iurt if not in home ( could be factorized together and with iurt config file code)</H1> + <B>root at mageia.org</B> + <A HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B126%5D%20use%20upload.conf%20from%20/etc/iurt%20if%20not%20in%20home%0A%20%28%20could%20be%20factorized%20together%20and%20with%20iurt%20config%20file%20code%29&In-Reply-To=%3C20101123215213.3C4003FCC8%40valstar.mageia.org%3E" + TITLE="[Mageia-sysadm] [126] use upload.conf from /etc/iurt if not in home ( could be factorized together and with iurt config file code)">root at mageia.org + </A><BR> + <I>Tue Nov 23 22:52:13 CET 2010</I> + <P><UL> + <LI>Previous message: <A HREF="000848.html">[Mageia-sysadm] Puppet Report for jonund.mageia.org +</A></li> + <LI>Next message: <A HREF="000850.html">[Mageia-sysadm] [426] ensure /etc/iurt/build is a directory +</A></li> + <LI> <B>Messages sorted by:</B> + <a href="date.html#849">[ date ]</a> + <a href="thread.html#849">[ thread ]</a> + <a href="subject.html#849">[ subject ]</a> + <a href="author.html#849">[ author ]</a> + </LI> + </UL> + <HR> +<!--beginarticle--> +<PRE>Revision: 126 +Author: blino +Date: 2010-11-23 22:52:12 +0100 (Tue, 23 Nov 2010) +Log Message: +----------- +use upload.conf from /etc/iurt if not in home (could be factorized together and with iurt config file code) + +Modified Paths: +-------------- + build_system/iurt/trunk/emi + build_system/iurt/trunk/ulri + +Modified: build_system/iurt/trunk/emi +=================================================================== +--- build_system/iurt/trunk/emi 2010-11-23 20:45:58 UTC (rev 125) ++++ build_system/iurt/trunk/emi 2010-11-23 21:52:12 UTC (rev 126) +@@ -46,7 +46,18 @@ + my $HOME = $ENV{HOME}; + + my $configfile = "$HOME/.upload.conf"; ++my $sysconfigfile = "/etc/iurt/upload.conf"; + ++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; ++ } ++} ++ + my %config_usage = ( + admin => { + desc => 'mail address of the bot administrator', +@@ -94,14 +105,6 @@ + }, + ); + +-my $config; +-if (-f $configfile) { +- $config = eval(cat_($configfile)) +- or die "FATAL $program_name: syntax error in $configfile"; +-} else { +- $config = {}; +-} +- + config_usage(\%config_usage, $config) if $run{config_usage}; + config_init(\%config_usage, $config, \%run); + + +Modified: build_system/iurt/trunk/ulri +=================================================================== +--- build_system/iurt/trunk/ulri 2010-11-23 20:45:58 UTC (rev 125) ++++ build_system/iurt/trunk/ulri 2010-11-23 21:52:12 UTC (rev 126) +@@ -55,12 +55,16 @@ + + my $HOME = $ENV{HOME}; + my $configfile = "$HOME/.upload.conf"; ++my $sysconfigfile = "/etc/iurt/upload.conf"; + +-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; ++ } + } + + my %config_usage = ( +-------------- next part -------------- +An HTML attachment was scrubbed... +URL: </pipermail/mageia-sysadm/attachments/20101123/d4ac661d/attachment-0001.html> +</PRE> + + + + + + + + + + + + + + +<!--endarticle--> + <HR> + <P><UL> + <!--threads--> + <LI>Previous message: <A HREF="000848.html">[Mageia-sysadm] Puppet Report for jonund.mageia.org +</A></li> + <LI>Next message: <A HREF="000850.html">[Mageia-sysadm] [426] ensure /etc/iurt/build is a directory +</A></li> + <LI> <B>Messages sorted by:</B> + <a href="date.html#849">[ date ]</a> + <a href="thread.html#849">[ thread ]</a> + <a href="subject.html#849">[ subject ]</a> + <a href="author.html#849">[ 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> |