This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, 6.1 has been updated
via 0a901f21ee2d51bd45d15abaec0df0e85710b37e (commit)
from fbbce1b7a4be4271d40b7abb13ebc78e6f6d9e11 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=0a901f21ee2d51bd45d15abaec0df0e85710b37e
commit 0a901f21ee2d51bd45d15abaec0df0e85710b37e
Author: Franck Villaume <[email protected]>
Date: Wed Jan 3 13:52:51 2018 +0000
forge cli: better debug in case of json wrong syntax
diff --git a/src/bin/forge b/src/bin/forge
index 6fc4e63..3e8e4b9 100755
--- a/src/bin/forge
+++ b/src/bin/forge
@@ -1673,7 +1673,12 @@ class CliActions {
$stream = $stream_ori;
}
unset($stream_ori);
- return $stream;
+ if ($stream) {
+ return $stream;
+ } else {
+ echo _('Unable to load file')._(': ')._('Check
syntax')."\n";
+ die();
+ }
}
private function getMappingId($idtofind, $objecttofind) {
-----------------------------------------------------------------------
Summary of changes:
src/bin/forge | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
