Merge lp:~facundo/ubuntu/lucid/pyinotify/fix-path-overlap into lp:ubuntu/lucid/pyinotify

[Facundo Batista]

Rename directories correctly in MOVE_SELF.

Upstream data:

 Commit: http://trac.dbzteam.org/pyinotify/changeset/c3cb39c167234e651ef20b1647161a073c2b9454

 Bug: http://trac.dbzteam.org/pyinotify/ticket/38

=== modified file 'debian/changelog'
--- debian/changelog	2010-01-29 15:42:42 +0000
+++ debian/changelog	2010-03-12 17:51:21 +0000
@@ -1,3 +1,10 @@
+pyinotify (0.8.9-1ubuntu2) lucid; urgency=low
+
+  * Cherry picked patch from upstream to fix overlapping when renaming
+    path in MOVE_SELF (LP: #530268)
+
+ -- Facundo Batista <[e-mail]>  Wed, 3 Mar 2010 17:49:22 -0300
+
 pyinotify (0.8.9-1ubuntu1) lucid; urgency=low
 
   * Cherry picked patch from upstream to fix event arrival after removing a

=== added file 'debian/patches/fix_path_overlap_in_move_self.patch'
--- debian/patches/fix_path_overlap_in_move_self.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix_path_overlap_in_move_self.patch	2010-03-12 17:51:21 +0000
@@ -0,0 +1,59 @@
+From: Sebastien Martini <[e-mail]>
+Subject: Fixed IN_MOVE_SELF renames of overlapping directories names 
+Origin: upstream,
+    http://trac.dbzteam.org/pyinotify/changeset/c3cb39c167234e651ef20b1647161a073c2b9454
+Bug: http://trac.dbzteam.org/pyinotify/ticket/38
+Bug-Ubuntu: https://bugs.edge.launchpad.net/ubuntu/+source/pyinotify/+bug/530268
+Reviewed-By: Facundo Batista <[e-mail]>
+Last-Update: 2010-03-12
+
+=== modified file 'python2/pyinotify.py'
+--- pyinotify.orig/python2/pyinotify.py	2010-01-11 02:28:44 +0000
++++ pyinotify/python2/pyinotify.py	2010-03-03 20:43:49 +0000
+@@ -681,16 +681,17 @@
+         if mv_:
+             dest_path = mv_[0]
+             watch_.path = dest_path
++            # add the separator to the source path to avoid overlapping
++            # path issue when testing with startswith()
++            src_path += os.path.sep
+             src_path_len = len(src_path)
+-            sep_len = len(os.path.sep)
+             # The next loop renames all watches with src_path as base path.
+             # It seems that IN_MOVE_SELF does not provide IN_ISDIR information
+             # therefore the next loop is iterated even if raw_event is a file.
+             for w in self._watch_manager.watches.values():
+                 if w.path.startswith(src_path):
+                     # Note that dest_path is a normalized path.
+-                    w.path = os.path.join(dest_path,
+-                                          w.path[src_path_len + sep_len:])
++                    w.path = os.path.join(dest_path, w.path[src_path_len:])
+         else:
+             log.error("The pathname '%s' of this watch %s has probably changed "
+                       "and couldn't be updated, so it cannot be trusted "
+
+=== modified file 'python3/pyinotify.py'
+--- pyinotify.orig/python3/pyinotify.py	2010-01-11 02:28:44 +0000
++++ pyinotify/python3/pyinotify.py	2010-03-03 20:43:56 +0000
+@@ -645,16 +645,17 @@
+         if mv_:
+             dest_path = mv_[0]
+             watch_.path = dest_path
++            # add the separator to the source path to avoid overlapping
++            # path issue when testing with startswith()
++            src_path += os.path.sep
+             src_path_len = len(src_path)
+-            sep_len = len(os.path.sep)
+             # The next loop renames all watches with src_path as base path.
+             # It seems that IN_MOVE_SELF does not provide IN_ISDIR information
+             # therefore the next loop is iterated even if raw_event is a file.
+             for w in self._watch_manager.watches.values():
+                 if w.path.startswith(src_path):
+                     # Note that dest_path is a normalized path.
+-                    w.path = os.path.join(dest_path,
+-                                          w.path[src_path_len + sep_len:])
++                    w.path = os.path.join(dest_path, w.path[src_path_len:])
+         else:
+             log.error("The pathname '%s' of this watch %s has probably changed "
+                       "and couldn't be updated, so it cannot be trusted "
+

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-01-29 15:42:42 +0000
+++ debian/patches/series	2010-03-12 17:51:21 +0000
@@ -1,1 +1,2 @@
 wd_missing.patch
+fix_path_overlap_in_move_self.patch