diff options
author | Tomás Touceda <chiiph@leap.se> | 2013-11-01 11:19:44 -0300 |
---|---|---|
committer | Tomás Touceda <chiiph@leap.se> | 2013-11-01 11:19:44 -0300 |
commit | e22077a7cf91d4284216f443f03e96a6767a4622 (patch) | |
tree | bb6d21fb8f7039dd63ab3524629808657643b0b2 | |
parent | 621e93c2f13c7344ee79a2397f056d248b25f4ce (diff) | |
parent | 903a16800594bff19ab570153f947353ca49e74b (diff) |
Merge branch 'release-0.3.1'0.3.1
-rw-r--r-- | CHANGELOG | 4 | ||||
-rw-r--r-- | src/main.cpp | 3 |
2 files changed, 6 insertions, 1 deletions
@@ -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/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, |