This is an automated email from the ASF dual-hosted git repository. humbedooh pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-ponymail-foal.git
commit a5a8a74df3677b92aef42e7c8b6181ac5e90031d Author: Daniel Gruno <[email protected]> AuthorDate: Tue Sep 8 18:05:09 2020 +0200 fix some errors - --nocloud didn't work - Make a .tmp file if server yaml exists --- tools/setup.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/tools/setup.py b/tools/setup.py index 95220a0..413c4eb 100755 --- a/tools/setup.py +++ b/tools/setup.py @@ -211,7 +211,8 @@ if args.mldom: if args.wc: wc = args.wc if args.nwc: - wc = False + wc = "n" + wce = False if args.dbshards: shards = args.dbshards if args.dbreplicas is not None: # Allow for 0 value @@ -425,8 +426,13 @@ if not os.path.exists("../site/js/config.js") and os.path.exists( ): shutil.copy("../site/js/config.js.sample", "../site/js/config.js") -print("Writing UI backend configuration file ponymail.yaml") -with open("../server/ponymail.yaml", "w") as f: +server_cfg = "../server/ponymail.yaml" +if not args.clobber and os.path.exists(server_cfg): + print("%s exists and clobber is not set" % server_cfg) + server_cfg = "../server/ponymail.yaml.tmp" + +print("Writing UI backend configuration file %s" % server_cfg) +with open(server_cfg, "w") as f: f.write(""" server: port: 8080 # Port to bind to
