[Koha-cvs] CVS: koha/misc koha.upgrade,1.17,1.17.2.1 Install.pm,1.88.2.2,1.88.2.3

[MJ Ray]

Update of /cvsroot/koha/koha/misc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19048

Modified Files:
      Tag: rel_2_2
	koha.upgrade Install.pm 
Log Message:
Actually set mysql password before trying to run updatedb script. Fix for bug 922

Index: koha.upgrade
===================================================================
RCS file: /cvsroot/koha/koha/misc/koha.upgrade,v
retrieving revision 1.17
retrieving revision 1.17.2.1
diff -C2 -r1.17 -r1.17.2.1
*** koha.upgrade	5 Jan 2005 14:31:17 -0000	1.17
--- koha.upgrade	4 Feb 2005 18:19:47 -0000	1.17.2.1
***************
*** 38,42 ****
--- 38,44 ----
  installfiles();
  # custom templates warning added to installfiles();
+ backupmycnf();
  updatedatabase();
+ restoremycnf();
  finalizeconfigfile();
  

Index: Install.pm
===================================================================
RCS file: /cvsroot/koha/koha/misc/Install.pm,v
retrieving revision 1.88.2.2
retrieving revision 1.88.2.3
diff -C2 -r1.88.2.2 -r1.88.2.3
*** Install.pm	24 Jan 2005 13:34:19 -0000	1.88.2.2
--- Install.pm	4 Feb 2005 18:19:48 -0000	1.88.2.3
***************
*** 1880,1883 ****
--- 1880,1884 ----
      if (! -e $ENV{"KOHA_CONF"}) { $ENV{"KOHA_CONF"}=$etcdir.'/koha.conf.tmp'; }
  	startsysout();	
+ 	setmysqlclipass($pass);
  	my $result=system ("perl -I $intranetdir/modules scripts/updater/updatedatabase -s");
  	if ($result) {