From 35ea0718c9ab6e0c63a27badb55a6af4e3048714 Mon Sep 17 00:00:00 2001
From: Damien <damien.burel@maarch.org>
Date: Mon, 15 Jul 2019 17:40:12 +0200
Subject: [PATCH] FEAT #9305 TIME 0:30 Error from update application
---
.../class/class_business_app_tools_Abstract.php | 4 ++--
sql/develop.sql | 2 +-
.../controllers/VersionUpdateController.php | 15 ++++++++++-----
3 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/apps/maarch_entreprise/class/class_business_app_tools_Abstract.php b/apps/maarch_entreprise/class/class_business_app_tools_Abstract.php
index 6bd70a62dec..e0cf002f1ef 100755
--- a/apps/maarch_entreprise/class/class_business_app_tools_Abstract.php
+++ b/apps/maarch_entreprise/class/class_business_app_tools_Abstract.php
@@ -593,8 +593,8 @@ abstract class business_app_tools_Abstract extends Database
$xmlBase = simplexml_load_file($xmlVersionBase);
//Find value in the xml database_version tag
if ($xmlBase) {
- $_SESSION['maarch_entreprise']
- ['xml_versionbase'] = (string) $xmlBase->version;
+ $versions = explode('.', (string)$xmlBase->version);
+ $_SESSION['maarch_entreprise']['xml_versionbase'] = "{$versions[0]}.{$versions[1]}";
} else {
$_SESSION['maarch_entreprise']['xml_versionbase'] = 'none';
}
diff --git a/sql/develop.sql b/sql/develop.sql
index aa4746dd471..301348594cf 100755
--- a/sql/develop.sql
+++ b/sql/develop.sql
@@ -5,7 +5,7 @@
-- --
-- --
-- *************************************************************************--
-UPDATE parameters SET param_value_string = '19.10.1' WHERE id = 'database_version';
+UPDATE parameters SET param_value_string = '19.12' WHERE id = 'database_version';
ALTER TABLE notif_email_stack ALTER COLUMN attachments TYPE text;
diff --git a/src/app/versionUpdate/controllers/VersionUpdateController.php b/src/app/versionUpdate/controllers/VersionUpdateController.php
index 057e0e0e8d5..50f8fd65759 100755
--- a/src/app/versionUpdate/controllers/VersionUpdateController.php
+++ b/src/app/versionUpdate/controllers/VersionUpdateController.php
@@ -89,14 +89,15 @@ class VersionUpdateController
}
$output = [];
- $diff = exec('git diff 2>&1', $output);
- $stagedDiff = exec('git diff --staged 2>&1', $output);
+ exec('git diff 2>&1', $output);
+ exec('git diff --staged 2>&1', $output);
return $response->withJson([
'lastAvailableMinorVersion' => $lastAvailableMinorVersion,
'lastAvailableMajorVersion' => $lastAvailableMajorVersion,
'currentVersion' => $currentVersion,
- 'canUpdate' => empty($output) && empty($diff) && empty($stagedDiff)
+ 'canUpdate' => empty($output),
+ 'diffOutput' => $output,
]);
}
@@ -157,11 +158,15 @@ class VersionUpdateController
$output = [];
exec('git fetch');
- exec("git checkout {$minorVersion} 2>&1", $output);
+ exec("git checkout {$minorVersion} 2>&1", $output, $returnCode);
- $log = "Application updated from {$currentVersion} to {$minorVersion}\nCheckout response => " . implode(' ', $output) . "\n";
+ $log = "Application update from {$currentVersion} to {$minorVersion}\nCheckout response {$returnCode} => " . implode(' ', $output) . "\n";
file_put_contents('updateVersion.log', $log, FILE_APPEND);
+ if ($returnCode != 0) {
+ return $response->withStatus(400)->withJson(['errors' => 'Application update failed. Please check updateVersion.log at root application']);
+ }
+
return $response->withStatus(204);
}
}
--
GitLab