[Mageia-sysadm] [122] apply patch from blino to use config file from /etc/iurt
root at mageia.org
root at mageia.org
Wed Nov 10 13:58:50 CET 2010
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>
More information about the Mageia-sysadm
mailing list