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

[Guillermo Gonzalez]

[Guillermo Gonzalez (verterok)]

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

[James Westby (james-w)]

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

[Guillermo Gonzalez (verterok)]

Hi James,

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

=== 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 @@
+pyinotify (0.8.9-1ubuntu1) lucid; urgency=low
+
+  * Cherry picked patch from upstream to fix event arrival after removing a
+    watch (LP: #507126)
+
+ -- Guillermo Gonzalez <[e-mail]>  Fri, 29 Jan 2010 12:07:53 -0300
+
 pyinotify (0.8.9-1) unstable; urgency=low
 
   * New upstream release
 
=== 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 @@
 Priority: optional
 Maintainer: Mikhail Gusarov <[e-mail]>
 Uploaders: Debian Python Modules Team <[e-mail]>
-Build-Depends: debhelper (>= 7), python
+Build-Depends: debhelper (>= 7), python, quilt
 Build-Depends-Indep: python-epydoc, python-support (>= 0.3)
 Standards-Version: 3.8.3
 XS-Python-Version: >=2.4
 
=== 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 @@
+wd_missing.patch
 
=== 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 @@
+=== modified file 'python2/pyinotify.py'
+--- pyinotify-0.8.9.orig/python2/pyinotify.py	2010-01-11 02:28:44 +0000
++++ pyinotify-0.8.9/python2/pyinotify.py	2010-01-25 17:01:22 +0000
+@@ -1121,6 +1121,13 @@
+         while self._eventq:
+             raw_event = self._eventq.popleft()  # pop next event
+             watch_ = self._watch_manager.get_watch(raw_event.wd)
++            if watch_ is None:
++                # Not really sure how we ended up here, nor how we should
++                # handle these types of events and if it is appropriate to
++                # completly skip them (like we are doing here).
++                log.warning("Unable to retrieve Watch object associated to %s",
++                            repr(raw_event))
++                continue
+             revent = self._sys_proc_fun(raw_event)  # system processings
+             if watch_ and watch_.proc_fun:
+                 watch_.proc_fun(revent)  # user processings
+
+=== modified file 'python3/pyinotify.py'
+--- pyinotify-0.8.9.orig/python3/pyinotify.py	2010-01-11 02:28:44 +0000
++++ pyinotify-0.8.9/python3/pyinotify.py	2010-01-25 17:01:36 +0000
+@@ -1084,6 +1084,13 @@
+         while self._eventq:
+             raw_event = self._eventq.popleft()  # pop next event
+             watch_ = self._watch_manager.get_watch(raw_event.wd)
++            if watch_ is None:
++                # Not really sure how we ended up here, nor how we should
++                # handle these types of events and if it is appropriate to
++                # completly skip them (like we are doing here).
++                log.warning("Unable to retrieve Watch object associated to %s",
++                            repr(raw_event))
++                continue
+             revent = self._sys_proc_fun(raw_event)  # system processings
+             if watch_ and watch_.proc_fun:
+                 watch_.proc_fun(revent)  # user processings
+
 
=== 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 @@
 # Based on sample debian/rules that uses debhelper.
 # GNU copyright 1997 to 1999 by Joey Hess.
 
-clean:
+include /usr/share/quilt/quilt.make
+
+clean: unpatch
 	dh_testdir
 	dh_testroot
 
@@ -14,7 +16,7 @@
 
 	dh_clean
 
-build:
+build: patch
 
 install: build
 	dh_testdir