[Koha-cvs] CVS: koha koha.upgrade,1.1.2.17,1.1.2.18

[Steve Tonnesen]

Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv2060

Modified Files:
      Tag: rel-1-2
	koha.upgrade 
Log Message:
Was checking for 'RC' in installed version


Index: koha.upgrade
===================================================================
RCS file: /cvsroot/koha/koha/koha.upgrade,v
retrieving revision 1.1.2.17
retrieving revision 1.1.2.18
diff -C2 -r1.1.2.17 -r1.1.2.18
*** koha.upgrade	27 Jul 2002 05:38:53 -0000	1.1.2.17
--- koha.upgrade	30 Aug 2002 16:30:10 -0000	1.1.2.18
***************
*** 19,25 ****
  
  ($::kohaversion) || ($::kohaversion='unknown version');
! my $newversion=`cat koha.version`;
! chomp $newversion;
! if ($::kohaversion =~ /RC/) {
      releasecandidatewarning();
  }
--- 19,25 ----
  
  ($::kohaversion) || ($::kohaversion='unknown version');
! $::newversion=`cat koha.version`;
! chomp $::newversion;
! if ($::newversion =~ /RC/) {
      releasecandidatewarning();
  }
***************
*** 31,35 ****
  ================
  
! You are attempting to upgrade from Koha $::kohaversion to $newversion.
  
  We recommend that you do a complete backup of all your files before upgrading.
--- 31,35 ----
  ================
  
! You are attempting to upgrade from Koha $::kohaversion to $::newversion.
  
  We recommend that you do a complete backup of all your files before upgrading.
***************
*** 359,363 ****
  	$kc->{'httpduser'}=1;
      } elsif (/^\s*kohaversion\s*=/) {
! 	$kccontents.="kohaversion=$newversion\n";
  	$kc->{'kohaversion'}=1;
      } elsif (/^\s*kohalogdir\s*=/) {
--- 359,363 ----
  	$kc->{'httpduser'}=1;
      } elsif (/^\s*kohaversion\s*=/) {
! 	$kccontents.="kohaversion=$::newversion\n";
  	$kc->{'kohaversion'}=1;
      } elsif (/^\s*kohalogdir\s*=/) {
***************
*** 376,380 ****
  
  unless (defined($kc->{'kohaversion'})) {
!     $kccontents.="kohaversion=$newversion\n";
  }
  unless (defined($kc->{'includes'})) {
--- 376,380 ----
  
  unless (defined($kc->{'kohaversion'})) {
!     $kccontents.="kohaversion=$::newversion\n";
  }
  unless (defined($kc->{'includes'})) {