From 947b17824f72378570a7a9cf6aeb1654ee7e4f18 Mon Sep 17 00:00:00 2001
From: tonnesen <tonnesen>
Date: Fri, 30 Aug 2002 16:30:10 +0000
Subject: [PATCH] Was checking for 'RC' in installed version

---
 koha.upgrade | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/koha.upgrade b/koha.upgrade
index 2e383c08c0..00a6728abe 100644
--- a/koha.upgrade
+++ b/koha.upgrade
@@ -18,9 +18,9 @@ loadconfigfile();
 
 
 ($::kohaversion) || ($::kohaversion='unknown version');
-my $newversion=`cat koha.version`;
-chomp $newversion;
-if ($::kohaversion =~ /RC/) {
+$::newversion=`cat koha.version`;
+chomp $::newversion;
+if ($::newversion =~ /RC/) {
     releasecandidatewarning();
 }
 
@@ -30,7 +30,7 @@ print qq|
 = Koha Upgrade =
 ================
 
-You are attempting to upgrade from Koha $::kohaversion to $newversion.
+You are attempting to upgrade from Koha $::kohaversion to $::newversion.
 
 We recommend that you do a complete backup of all your files before upgrading.
 This upgrade script will make a backup copy of your files for you.
@@ -358,7 +358,7 @@ while (<KC>) {
 	$kccontents.="httpduser=$httpduser\n";
 	$kc->{'httpduser'}=1;
     } elsif (/^\s*kohaversion\s*=/) {
-	$kccontents.="kohaversion=$newversion\n";
+	$kccontents.="kohaversion=$::newversion\n";
 	$kc->{'kohaversion'}=1;
     } elsif (/^\s*kohalogdir\s*=/) {
 	$kccontents.="kohalogdir=$::kohalogdir\n";
@@ -375,7 +375,7 @@ while (<KC>) {
 }
 
 unless (defined($kc->{'kohaversion'})) {
-    $kccontents.="kohaversion=$newversion\n";
+    $kccontents.="kohaversion=$::newversion\n";
 }
 unless (defined($kc->{'includes'})) {
     $kccontents.="includes=$::intranetdir/htdocs/includes\n";
-- 
2.39.5