Zim

Merge lp:~flashbuster/zim/zim into lp:~jaap.karssenberg/zim/pyzim

  1. zim
  2. Merge into pyzim
Proposed by FlashBuster
Status: Merged
Merged at revision: 596
Proposed branch: lp:~flashbuster/zim/zim
Merge into: lp:~jaap.karssenberg/zim/pyzim
Diff against target: 12 lines (+1/-1)
1 file modified
zim/ipc.py (+1/-1)
To merge this branch: bzr merge lp:~flashbuster/zim/zim
Reviewer Review Type Date Requested Status
Jaap Karssenberg Pending
Review via email: mp+127249@code.launchpad.net

Description of the change

fixes ipc.py which tried to access sys.argv[1] when zim was started without arguments.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'zim/ipc.py'
2--- zim/ipc.py 2012-09-29 21:21:38 +0000
3+++ zim/ipc.py 2012-10-01 11:49:22 +0000
4@@ -102,7 +102,7 @@
5 bootstrap of subprocesses.
6 '''
7 multiprocessing.freeze_support()
8- if sys.argv[1] == '--ipc-server-main':
9+ if len(sys.argv) > 1 and sys.argv[1] == '--ipc-server-main':
10 global SERVER_ADDRESS
11 SERVER_ADDRESS = sys.argv[2] # for testing
12 loglevel = sys.argv[3]