nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2025-12-30 00:53:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

include stderr in git pull results and check for error (#2104)

Browse Source 
Old result (seems correct but actually failed)
Updating d190f6a..d958bea

Corrected result (includes failure message):
Updating d190f6a..d958bea
error: Your local changes to the following files would be overwritten by merge:
        app/fax/fax_log_view.php
Please, commit your changes or stash them before you can merge.
This commit is contained in:
jebsolutions
2016-11-20 15:55:12 -05:00
committed by FusionPBX
parent 59659ddb7a
commit aa12c13056
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/upgrade/index.php
View File

@@ -56,7 +56,7 @@
// run source update
if ($do["source"] && permission_exists("upgrade_source") && !is_dir("/usr/share/examples/fusionpbx")) {
chdir($_SERVER["PROJECT_ROOT"]);
exec("git pull", $response_source_update);
exec("git pull 2>&1", $response_source_update);
$update_failed = true;
if (sizeof($response_source_update) > 0) {
$_SESSION["response_source_update"] = $response_source_update;
@@ -64,6 +64,11 @@
if (substr_count($response_line, "Updating ") > 0 || substr_count($response_line, "Already up-to-date.") > 0) {
$update_failed = false;
}
if (substr_count($response_line, "error") > 0) {
$update_failed = true;
break;
}
}
}
if ($update_failed) {