[Koha-cvs] CVS: koha/C4 Context.pm,1.9,1.10

[Paul POULAIN]

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1:/tmp/cvs-serv3352

Modified Files:
	Context.pm 
Log Message:
checks that the config file passed in parameter exist, otherwise, uses the default one (/etc/koha.conf)
useful in upgradedb2marc.pl script.
* if this script is called during installation, uses /etc/koha.conf.tmp
* if it's called manually (after installation), uses /etc/koha.conf, as the tmp file is no more here :-)

Index: Context.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Context.pm,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** Context.pm	10 Oct 2002 04:34:20 -0000	1.9
--- Context.pm	20 Dec 2002 13:54:31 -0000	1.10
***************
*** 170,173 ****
--- 170,175 ----
  	my $self = {};
  
+ 	# check that the specified config file exists
+ 	undef $conf_fname unless (-e $conf_fname);
  	# Figure out a good config file to load if none was specified.
  	if (!defined($conf_fname))
***************
*** 178,182 ****
  				CONFIG_FNAME;
  	}
- 
  	$self->{"config_file"} = $conf_fname;
  
--- 180,183 ----