[Koha-cvs] CVS: koha/misc Install.pm,1.80,1.81 koha.upgrade,1.15,1.16

[Paul POULAIN]

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

Modified Files:
        Install.pm koha.upgrade 
Log Message:
fix suggested by Slef

Index: Install.pm
===================================================================
RCS file: /cvsroot/koha/koha/misc/Install.pm,v
retrieving revision 1.80
retrieving revision 1.81
diff -C2 -r1.80 -r1.81
*** Install.pm  23 Nov 2004 12:27:39 -0000      1.80
--- Install.pm  23 Nov 2004 16:02:32 -0000      1.81
***************
*** 284,288 ****
  #'
  sub releasecandidatewarning {
!     my $message=getmessage('ReleaseCandidateWarning', [$::newversion, 
$::newversion]);
      my $answer=showmessage($message, 'yn', 'n');
  
--- 284,288 ----
  #'
  sub releasecandidatewarning {
!     my $message=getmessage('ReleaseCandidateWarning', [$newversion, 
$newversion]);
      my $answer=showmessage($message, 'yn', 'n');
  

Index: koha.upgrade
===================================================================
RCS file: /cvsroot/koha/koha/misc/koha.upgrade,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** koha.upgrade        16 Nov 2004 13:04:34 -0000      1.15
--- koha.upgrade        23 Nov 2004 16:02:33 -0000      1.16
***************
*** 15,27 ****
  loadconfigfile();
  
! ($::kohaversion = Install::getkohaversion() ) || ($::kohaversion='unknown 
version');
! $::newversion=`cat koha.version`;
! chomp $::newversion;
! if ($::newversion =~ /RC/) {
!       releasecandidatewarning();
  }
  
! #FIXME: need kohaversion number
! my $answer = 
showmessage(getmessage('WelcomeToUpgrader',[$::kohaversion,$::newversion]),'yn');
  
  unless ($answer =~/y/i) {
--- 15,28 ----
  loadconfigfile();
  
! my $kohaversion=`cat koha.version`;
! chomp $kohaversion;
! Install::setkohaversion $kohaversion;
! 
! 
! if ($kohaversion =~ /RC/) {
!     releasecandidatewarning();
  }
  
! my $answer = 
showmessage(getmessage('WelcomeToUpgrader',[$kohaversion,$::newversion]),'yn');
  
  unless ($answer =~/y/i) {