From e7b8844d338fdacb50d7dc5749571d6697381d67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Touceda?= Date: Wed, 30 Oct 2013 16:04:31 -0300 Subject: Only add logfile=bitmask.log if no logfile was specified --- src/main.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main.cpp b/src/main.cpp index d84b15a..e528289 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -163,7 +163,8 @@ main(int argc, char** argv) "import encodings.idna\n" // we need to make sure this is imported "sys.argv.append('--standalone')\n" "sys.argv.append('--debug')\n" - "sys.argv.append('--logfile=bitmask.log')\n", global, global); + "if any(map(lambda x: x.startswith('--logfile') or x.startswith('-l'), sys.argv))\n" + " sys.argv.append('--logfile=bitmask.log')\n", global, global); py::exec_file("apps/launcher.py", global, -- cgit v1.2.3 From 3671f26a12827c3da616826d7517259eed80a0ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Touceda?= Date: Wed, 30 Oct 2013 16:11:08 -0300 Subject: Add changes file --- changes/bug_support_provided_logfile | 1 + 1 file changed, 1 insertion(+) create mode 100644 changes/bug_support_provided_logfile diff --git a/changes/bug_support_provided_logfile b/changes/bug_support_provided_logfile new file mode 100644 index 0000000..0a32ae4 --- /dev/null +++ b/changes/bug_support_provided_logfile @@ -0,0 +1 @@ + o Support user provided logfile option and default to bitmask.log otherwise. Fixes #4153. -- cgit v1.2.3 From 903a16800594bff19ab570153f947353ca49e74b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Touceda?= Date: Fri, 1 Nov 2013 11:19:19 -0300 Subject: Fold in changes --- CHANGELOG | 4 ++++ changes/bug_support_provided_logfile | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) delete mode 100644 changes/bug_support_provided_logfile diff --git a/CHANGELOG b/CHANGELOG index bc9c679..65abb84 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +0.3.1 Nov 1: + o Support user provided logfile option and default to bitmask.log + otherwise. Fixes #4153. + 0.3.0 Aug 23: o Use bitmask.log instead of leap_client.log. Closes #3424. o Update launcher icon, jumping guy -> rainbow mask. diff --git a/changes/bug_support_provided_logfile b/changes/bug_support_provided_logfile deleted file mode 100644 index 0a32ae4..0000000 --- a/changes/bug_support_provided_logfile +++ /dev/null @@ -1 +0,0 @@ - o Support user provided logfile option and default to bitmask.log otherwise. Fixes #4153. -- cgit v1.2.3