From a1a1bfc8fa2c8b9df89b09ced3afe76ad86820f0 Mon Sep 17 00:00:00 2001 From: slef Date: Fri, 31 Oct 2003 17:40:51 +0000 Subject: [PATCH] Fixing database upgrade failure from koha.upgrade and setting language --- misc/Install.pm | 3 ++- misc/koha.upgrade | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/misc/Install.pm b/misc/Install.pm index 3ab5070325..5c19a57a35 100644 --- a/misc/Install.pm +++ b/misc/Install.pm @@ -1736,7 +1736,8 @@ Which language do you choose? |; sub updatedatabase { # At this point, $etcdir/koha.conf must exist, for C4::Context - $ENV{"KOHA_CONF"}=$etcdir.'/koha.conf.tmp'; + $ENV{"KOHA_CONF"}=$etcdir.'/koha.conf'; + if (! -e $ENV{"KOHA_CONF"}) { $ENV{"KOHA_CONF"}=$etcdir.'/koha.conf.tmp'; } startsysout(); my $result=system ("perl -I $intranetdir/modules scripts/updater/updatedatabase"); if ($result) { diff --git a/misc/koha.upgrade b/misc/koha.upgrade index 8e915da1b2..16560e3cc5 100644 --- a/misc/koha.upgrade +++ b/misc/koha.upgrade @@ -4,7 +4,7 @@ use strict; # please develop with the strict pragma use Install; -$::language='en'; +setlanguage('en'); ############################################### # SET THE etcdir ENVIRONMENT VAR INSTEAD # -- 2.39.5