Merge lp:~verterok/ubuntu/lucid/pyinotify/missing_wd into lp:ubuntu/lucid/pyinotify

Proposed by Guillermo Gonzalez
Status: Merged
Merged at revision: not available
Proposed branch: lp:~verterok/ubuntu/lucid/pyinotify/missing_wd
Merge into: lp:ubuntu/lucid/pyinotify
Diff against target: 99 lines (+49/-3)
5 files modified
debian/changelog (+7/-0)
debian/control (+1/-1)
debian/patches/series (+1/-0)
debian/patches/wd_missing.patch (+36/-0)
debian/rules (+4/-2)
To merge this branch: bzr merge lp:~verterok/ubuntu/lucid/pyinotify/missing_wd
Reviewer Review Type Date Requested Status
James Westby (community) Approve
Review via email: mp+18266@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Guillermo Gonzalez (verterok) wrote :

This branch adds a patch to fix Bug #507126, upstream Bug http://trac.dbzteam.org/pyinotify/ticket/36

Revision history for this message
James Westby (james-w) wrote :

Thanks, uploaded with a couple of tweaks, notably running update-maintainer
and adding https://wiki.ubuntu.com/UbuntuDevelopment/PatchTaggingGuidelines
for the patch you added.

Thanks,

James

review: Approve
Revision history for this message
Guillermo Gonzalez (verterok) wrote :

Hi James,

Thanks for fixing it, I'll take look to the docs (for the next merge proposal ;-) )

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2010-01-11 02:28:44 +0000
+++ debian/changelog 2010-01-29 16:30:31 +0000
@@ -1,3 +1,10 @@
1pyinotify (0.8.9-1ubuntu1) lucid; urgency=low
2
3 * Cherry picked patch from upstream to fix event arrival after removing a
4 watch (LP: #507126)
5
6 -- Guillermo Gonzalez <guillermo.gonzalez@canonical.com> Fri, 29 Jan 2010 12:07:53 -0300
7
1pyinotify (0.8.9-1) unstable; urgency=low8pyinotify (0.8.9-1) unstable; urgency=low
29
3 * New upstream release10 * New upstream release
411
=== modified file 'debian/control'
--- debian/control 2009-11-11 19:29:08 +0000
+++ debian/control 2010-01-29 16:30:31 +0000
@@ -3,7 +3,7 @@
3Priority: optional3Priority: optional
4Maintainer: Mikhail Gusarov <dottedmag@dottedmag.net>4Maintainer: Mikhail Gusarov <dottedmag@dottedmag.net>
5Uploaders: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>5Uploaders: Debian Python Modules Team <python-modules-team@lists.alioth.debian.org>
6Build-Depends: debhelper (>= 7), python6Build-Depends: debhelper (>= 7), python, quilt
7Build-Depends-Indep: python-epydoc, python-support (>= 0.3)7Build-Depends-Indep: python-epydoc, python-support (>= 0.3)
8Standards-Version: 3.8.38Standards-Version: 3.8.3
9XS-Python-Version: >=2.49XS-Python-Version: >=2.4
1010
=== added directory 'debian/patches'
=== added file 'debian/patches/series'
--- debian/patches/series 1970-01-01 00:00:00 +0000
+++ debian/patches/series 2010-01-29 16:30:31 +0000
@@ -0,0 +1,1 @@
1wd_missing.patch
02
=== added file 'debian/patches/wd_missing.patch'
--- debian/patches/wd_missing.patch 1970-01-01 00:00:00 +0000
+++ debian/patches/wd_missing.patch 2010-01-29 16:30:31 +0000
@@ -0,0 +1,36 @@
1=== modified file 'python2/pyinotify.py'
2--- pyinotify-0.8.9.orig/python2/pyinotify.py 2010-01-11 02:28:44 +0000
3+++ pyinotify-0.8.9/python2/pyinotify.py 2010-01-25 17:01:22 +0000
4@@ -1121,6 +1121,13 @@
5 while self._eventq:
6 raw_event = self._eventq.popleft() # pop next event
7 watch_ = self._watch_manager.get_watch(raw_event.wd)
8+ if watch_ is None:
9+ # Not really sure how we ended up here, nor how we should
10+ # handle these types of events and if it is appropriate to
11+ # completly skip them (like we are doing here).
12+ log.warning("Unable to retrieve Watch object associated to %s",
13+ repr(raw_event))
14+ continue
15 revent = self._sys_proc_fun(raw_event) # system processings
16 if watch_ and watch_.proc_fun:
17 watch_.proc_fun(revent) # user processings
18
19=== modified file 'python3/pyinotify.py'
20--- pyinotify-0.8.9.orig/python3/pyinotify.py 2010-01-11 02:28:44 +0000
21+++ pyinotify-0.8.9/python3/pyinotify.py 2010-01-25 17:01:36 +0000
22@@ -1084,6 +1084,13 @@
23 while self._eventq:
24 raw_event = self._eventq.popleft() # pop next event
25 watch_ = self._watch_manager.get_watch(raw_event.wd)
26+ if watch_ is None:
27+ # Not really sure how we ended up here, nor how we should
28+ # handle these types of events and if it is appropriate to
29+ # completly skip them (like we are doing here).
30+ log.warning("Unable to retrieve Watch object associated to %s",
31+ repr(raw_event))
32+ continue
33 revent = self._sys_proc_fun(raw_event) # system processings
34 if watch_ and watch_.proc_fun:
35 watch_.proc_fun(revent) # user processings
36
037
=== modified file 'debian/rules'
--- debian/rules 2010-01-11 02:28:44 +0000
+++ debian/rules 2010-01-29 16:30:31 +0000
@@ -3,7 +3,9 @@
3# Based on sample debian/rules that uses debhelper.3# Based on sample debian/rules that uses debhelper.
4# GNU copyright 1997 to 1999 by Joey Hess.4# GNU copyright 1997 to 1999 by Joey Hess.
55
6clean:6include /usr/share/quilt/quilt.make
7
8clean: unpatch
7 dh_testdir9 dh_testdir
8 dh_testroot10 dh_testroot
911
@@ -14,7 +16,7 @@
1416
15 dh_clean17 dh_clean
1618
17build:19build: patch
1820
19install: build21install: build
20 dh_testdir22 dh_testdir

Subscribers

People subscribed via source and target branches