diff options
| author | Nicolas Vigier <boklm@mageia.org> | 2013-04-14 13:46:12 +0000 |
|---|---|---|
| committer | Nicolas Vigier <boklm@mageia.org> | 2013-04-14 13:46:12 +0000 |
| commit | 1be510f9529cb082f802408b472a77d074b394c0 (patch) | |
| tree | b175f9d5fcb107576dabc768e7bd04d4a3e491a0 /zarb-ml/mageia-sysadm/attachments/20101108/a7bc2d4d | |
| parent | fa5098cf210b23ab4f419913e28af7b1b07dafb2 (diff) | |
| download | archives-master.tar archives-master.tar.gz archives-master.tar.bz2 archives-master.tar.xz archives-master.zip | |
Diffstat (limited to 'zarb-ml/mageia-sysadm/attachments/20101108/a7bc2d4d')
| -rw-r--r-- | zarb-ml/mageia-sysadm/attachments/20101108/a7bc2d4d/attachment-0001.bin | 28 | ||||
| -rw-r--r-- | zarb-ml/mageia-sysadm/attachments/20101108/a7bc2d4d/attachment.bin | 28 |
2 files changed, 56 insertions, 0 deletions
diff --git a/zarb-ml/mageia-sysadm/attachments/20101108/a7bc2d4d/attachment-0001.bin b/zarb-ml/mageia-sysadm/attachments/20101108/a7bc2d4d/attachment-0001.bin new file mode 100644 index 000000000..42c5bfd1a --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101108/a7bc2d4d/attachment-0001.bin @@ -0,0 +1,28 @@ +Index: iurt2 +=================================================================== +--- iurt2 (revision 103) ++++ iurt2 (working copy) +@@ -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}) { diff --git a/zarb-ml/mageia-sysadm/attachments/20101108/a7bc2d4d/attachment.bin b/zarb-ml/mageia-sysadm/attachments/20101108/a7bc2d4d/attachment.bin new file mode 100644 index 000000000..42c5bfd1a --- /dev/null +++ b/zarb-ml/mageia-sysadm/attachments/20101108/a7bc2d4d/attachment.bin @@ -0,0 +1,28 @@ +Index: iurt2 +=================================================================== +--- iurt2 (revision 103) ++++ iurt2 (working copy) +@@ -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}) { |