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, master has been updated
via 555756b3f095fc6cc8a0b135682239ec78145366 (commit)
from d02956c973e21e7479a724f535e695d1e1941e59 (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=555756b3f095fc6cc8a0b135682239ec78145366
commit 555756b3f095fc6cc8a0b135682239ec78145366
Author: Franck Villaume <[email protected]>
Date: Thu Sep 29 15:14:15 2016 +0200
moinmoin plugin port support more robust
diff --git a/src/plugins/moinmoin/lib/farmconfig.py
b/src/plugins/moinmoin/lib/farmconfig.py
index 7047ed7..83fde4a 100644
--- a/src/plugins/moinmoin/lib/farmconfig.py
+++ b/src/plugins/moinmoin/lib/farmconfig.py
@@ -26,10 +26,13 @@ class FarmConfig(multiconfig.DefaultConfig):
forge_get_config = fusionforge.FusionForgeLink(session_cookies).get_config
ff_host =
fusionforge.FusionForgeLink(session_cookies).get_config('web_host')
ff_url_prefix = forge_get_config('url_prefix')
- ff_http = forge_get_config('http_port')
+ ff_port = ''
+ if forge_get_config('http_port'):
+ ff_port = forge_get_config('http_port')
if forge_get_config('use_ssl'):
- ff_port = forge_get_config('https_port')
- if ff_port:
+ if forge_get_config('https_port'):
+ ff_port = forge_get_config('https_port')
+ if ff_port != '':
ff_port = ':' + ff_port
auth = [ffsa]
-----------------------------------------------------------------------
Summary of changes:
src/plugins/moinmoin/lib/farmconfig.py | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
