rev 1291 - in trunk/siesta: . bin

[prev] [thread] [next] [lurker] [Date index for 2003/08/08]

Author: richardc
Date: 2003-08-08 11:02:19 +0100 (Fri, 08 Aug 2003)
New Revision: 1291

Modified:
   trunk/siesta/Config.pm.in
   trunk/siesta/bin/nacho
Log:
attempt to fix the broken ordering of the -d -f stuff in nacho

Modified: trunk/siesta/Config.pm.in
===================================================================
--- trunk/siesta/Config.pm.in	2003-08-01 17:00:49 UTC (rev 1290)
+++ trunk/siesta/Config.pm.in	2003-08-08 10:02:19 UTC (rev 1291)
@@ -2,8 +2,8 @@
 package Siesta::Config;
 use strict;
 use vars qw( $CONFIG_FILE $ROOT $MESSAGES @STORAGE $ARCHIVE $LOG_PATH $LOG_LEVEL $config );
+use AppConfig qw(:expand :argcount);
 
-
 =head1 NAME 
 
 Siesta::Config - organise the configuration of a Siesta install
@@ -91,9 +91,7 @@
 
 =cut
 
-BEGIN {
-    use AppConfig qw(:expand :argcount);
-
+sub import {
     $ROOT = '@@ROOT@@';
     $CONFIG_FILE = '@@ROOT@@/siesta.conf' unless defined $CONFIG_FILE;
 

Modified: trunk/siesta/bin/nacho
===================================================================
--- trunk/siesta/bin/nacho	2003-08-01 17:00:49 UTC (rev 1290)
+++ trunk/siesta/bin/nacho	2003-08-08 10:02:19 UTC (rev 1291)
@@ -7,6 +7,7 @@
 use Tie::IxHash;
 use String::ShellQuote;
 use UNIVERSAL::require;
+use Siesta::Config;
 
 BEGIN {
     while (@ARGV) {
@@ -19,6 +20,7 @@
         if ($ARGV[0] eq '-f') {
             shift;
             $Siesta::Config::CONFIG_FILE = shift;
+            Siesta::Config->import; # reimport - reloads the config file
             next;
         }
 
@@ -35,9 +37,6 @@
     }
 }
 
-use Siesta::Config;
-print "$Siesta::Config::MESSAGES\n";
-
 eval {
     require Siesta;
     require Siesta::List;

• rev 1291 - in trunk/siesta: . bin richardc 11:02 on 08 Aug 2003

Generated at 13:57 on 01 Jul 2004 by mariachi 0.52