[Koha-cvs] CVS: koha/misc koha.upgrade,1.11,1.12 Install.pm,1.62,1.63

[MJ Ray]

Update of /cvsroot/koha/koha/misc
In directory sc8-pr-cvs1:/tmp/cvs-serv28087

Modified Files:
	koha.upgrade Install.pm 
Log Message:
Fixing database upgrade failure from koha.upgrade and setting language

Index: koha.upgrade
===================================================================
RCS file: /cvsroot/koha/koha/misc/koha.upgrade,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** koha.upgrade	31 Oct 2003 17:34:25 -0000	1.11
--- koha.upgrade	31 Oct 2003 17:40:51 -0000	1.12
***************
*** 5,9 ****
  use Install;
  
! $::language='en';
  
  ###############################################
--- 5,9 ----
  use Install;
  
! setlanguage('en');
  
  ###############################################

Index: Install.pm
===================================================================
RCS file: /cvsroot/koha/koha/misc/Install.pm,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -r1.62 -r1.63
*** Install.pm	31 Oct 2003 17:34:26 -0000	1.62
--- Install.pm	31 Oct 2003 17:40:51 -0000	1.63
***************
*** 1737,1741 ****
  sub updatedatabase {
      # At this point, $etcdir/koha.conf must exist, for C4::Context
!     $ENV{"KOHA_CONF"}=$etcdir.'/koha.conf.tmp';
  	startsysout();	
  	my $result=system ("perl -I $intranetdir/modules scripts/updater/updatedatabase");
--- 1737,1742 ----
  sub updatedatabase {
      # At this point, $etcdir/koha.conf must exist, for C4::Context
!     $ENV{"KOHA_CONF"}=$etcdir.'/koha.conf';
!     if (! -e $ENV{"KOHA_CONF"}) { $ENV{"KOHA_CONF"}=$etcdir.'/koha.conf.tmp'; }
  	startsysout();	
  	my $result=system ("perl -I $intranetdir/modules scripts/updater/updatedatabase");