fix suggested by Slef

This commit is contained in:
tipaul 2004-11-23 16:02:32 +00:00
parent 8ddc4ec447
commit 62fd54745e
2 changed files with 9 additions and 8 deletions

View File

@ -283,7 +283,7 @@ Press <ENTER> to exit the installer: |;
#'
sub releasecandidatewarning {
my $message=getmessage('ReleaseCandidateWarning', [$::newversion, $::newversion]);
my $message=getmessage('ReleaseCandidateWarning', [$newversion, $newversion]);
my $answer=showmessage($message, 'yn', 'n');
if ($answer =~ /y/i) {

View File

@ -14,15 +14,16 @@ Install::setetcdir($ENV{etcdir}||'/etc');
my $input;
loadconfigfile();
($::kohaversion = Install::getkohaversion() ) || ($::kohaversion='unknown version');
$::newversion=`cat koha.version`;
chomp $::newversion;
if ($::newversion =~ /RC/) {
releasecandidatewarning();
my $kohaversion=`cat koha.version`;
chomp $kohaversion;
Install::setkohaversion $kohaversion;
if ($kohaversion =~ /RC/) {
releasecandidatewarning();
}
#FIXME: need kohaversion number
my $answer = showmessage(getmessage('WelcomeToUpgrader',[$::kohaversion,$::newversion]),'yn');
my $answer = showmessage(getmessage('WelcomeToUpgrader',[$kohaversion,$::newversion]),'yn');
unless ($answer =~/y/i) {
showmessage(getmessage('AbortingInstall'),'none');