From cd7cf8bb97c004ee78c2bfb6d085ec7666e02083 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 31 Jul 2011 13:28:45 +0000 Subject: [PATCH] Work on 3.1 packaging --- build/rpm/install.forced.php.install | 1 + htdocs/install/etape5.php | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/rpm/install.forced.php.install b/build/rpm/install.forced.php.install index fafdc2df676..f01e5303ce0 100755 --- a/build/rpm/install.forced.php.install +++ b/build/rpm/install.forced.php.install @@ -3,6 +3,7 @@ $force_install_noedit=2; $force_install_message='KeepDefaultValuesDeb'; $force_install_main_data_root='/usr/share/dolibarr/documents'; $force_install_type='mysqli'; +$force_install_dbserver='localhost'; $force_install_port='3306'; $force_install_database='dolibarrrpm'; $force_install_createdatabase='1'; diff --git a/htdocs/install/etape5.php b/htdocs/install/etape5.php index 0c1c03cfdd9..0037190af06 100644 --- a/htdocs/install/etape5.php +++ b/htdocs/install/etape5.php @@ -24,7 +24,7 @@ * \file htdocs/install/etape5.php * \ingroup install * \brief Last page of upgrade or install process - * \version $Id: etape5.php,v 1.105 2011/07/31 11:56:43 eldy Exp $ + * \version $Id: etape5.php,v 1.106 2011/07/31 13:28:45 eldy Exp $ */ include_once("./inc.php"); @@ -364,7 +364,6 @@ elseif (preg_match('/upgrade/i',$action)) if (! empty($force_install_lockinstall)) { // Upgrade is finished, we create the lock file - $lockfile="../../install.lock"; $fp = @fopen($lockfile, "w"); if ($fp) {