[Koha-cvs] CVS: koha/misc koha.upgrade,1.17.2.2,1.17.2.3

[MJ Ray]

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

Modified Files:
      Tag: rel_2_2
        koha.upgrade 
Log Message:
Read current koha version before resetting it, then display it (fix bug 921)

Index: koha.upgrade
===================================================================
RCS file: /cvsroot/koha/koha/misc/koha.upgrade,v
retrieving revision 1.17.2.2
retrieving revision 1.17.2.3
diff -C2 -r1.17.2.2 -r1.17.2.3
*** koha.upgrade        4 Feb 2005 18:41:43 -0000       1.17.2.2
--- koha.upgrade        28 Feb 2005 18:47:45 -0000      1.17.2.3
***************
*** 15,18 ****
--- 15,19 ----
  loadconfigfile();
  
+ my $curr_ver = Install::getkohaversion();
  $::newversion=`cat koha.version`;
  chomp $::newversion;
***************
*** 24,28 ****
  }
  
! my $answer = 
showmessage(getmessage('WelcomeToUpgrader',[$::newversion]),'yn','n');
  if ($answer eq "Y" || $answer eq "y") {
        print "Great! continuing upgrade... \n";
--- 25,29 ----
  }
  
! my $answer = 
showmessage(getmessage('WelcomeToUpgrader',[$curr_ver,$::newversion]),'yn','n');
  if ($answer eq "Y" || $answer eq "y") {
        print "Great! continuing upgrade... \n";