Merge lp:~cr3/checkbox/719552 into lp:checkbox

Proposed by Marc Tardif
Status: Merged
Merged at revision: 883
Proposed branch: lp:~cr3/checkbox/719552
Merge into: lp:checkbox
Diff against target: 34 lines (+9/-2)
2 files modified
debian/changelog (+6/-0)
plugins/lock_prompt.py (+3/-2)
To merge this branch: bzr merge lp:~cr3/checkbox/719552
Reviewer Review Type Date Requested Status
Marc Tardif (community) Approve
Review via email: mp+49864@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Marc Tardif (cr3) wrote :

Tested on natty and fixes the problem.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-02-14 23:37:43 +0000
3+++ debian/changelog 2011-02-15 19:46:34 +0000
4@@ -1,3 +1,9 @@
5+checkbox (0.11.1) natty; urgency=low
6+
7+ * Checking for lock file before firing stop-all event (LP: #719552)
8+
9+ -- Marc Tardif <marc@ubuntu.com> Tue, 15 Feb 2011 14:20:31 -0500
10+
11 checkbox (0.11) natty; urgency=low
12
13 New upstream release (LP: #719073):
14
15=== modified file 'plugins/lock_prompt.py'
16--- plugins/lock_prompt.py 2011-02-09 20:43:07 +0000
17+++ plugins/lock_prompt.py 2011-02-15 19:46:34 +0000
18@@ -65,13 +65,14 @@
19
20 # Stop the process if the lock is deleted
21 def handler(signum, frame):
22- self._manager.reactor.stop_all()
23+ if not posixpath.exists(self.filename):
24+ self._manager.reactor.stop_all()
25
26 signal.signal(signal.SIGIO, handler)
27 fd = os.open(directory, os.O_RDONLY)
28
29 fcntl.fcntl(fd, fcntl.F_SETSIG, 0)
30- fcntl.fcntl(fd, fcntl.F_NOTIFY, fcntl.DN_DELETE)
31+ fcntl.fcntl(fd, fcntl.F_NOTIFY, fcntl.DN_DELETE|fcntl.DN_MULTISHOT)
32
33
34 factory = LockPrompt

Subscribers

People subscribed via source and target branches