[Python-apps-commits] r4010 - in packages/pytagsfs/trunk/debian/patches (3 files)
rrs-guest at users.alioth.debian.org
rrs-guest at users.alioth.debian.org
Tue Oct 20 12:52:11 UTC 2009
Date: Tuesday, October 20, 2009 @ 12:52:08
Author: rrs-guest
Revision: 4010
Remove dpatch stuff
Deleted:
packages/pytagsfs/trunk/debian/patches/00list
packages/pytagsfs/trunk/debian/patches/01_bug_reporting.dpatch
packages/pytagsfs/trunk/debian/patches/02_pyinotify_compatibility.dpatch
Deleted: packages/pytagsfs/trunk/debian/patches/00list
===================================================================
--- packages/pytagsfs/trunk/debian/patches/00list 2009-10-20 12:52:02 UTC (rev 4009)
+++ packages/pytagsfs/trunk/debian/patches/00list 2009-10-20 12:52:08 UTC (rev 4010)
@@ -1,2 +0,0 @@
-01_bug_reporting
-02_pyinotify_compatibility
Deleted: packages/pytagsfs/trunk/debian/patches/01_bug_reporting.dpatch
===================================================================
--- packages/pytagsfs/trunk/debian/patches/01_bug_reporting.dpatch 2009-10-20 12:52:02 UTC (rev 4009)
+++ packages/pytagsfs/trunk/debian/patches/01_bug_reporting.dpatch 2009-10-20 12:52:08 UTC (rev 4010)
@@ -1,49 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_bug_reporting.dpatch by Y Giridhar Appaji Nag <giridhar at appaji.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Set bug reporting target to submit at bugs.debian.org/reportbug
-
- at DPATCH@
-diff -urNad pytagsfs-0.6.0~/BUGS pytagsfs-0.6.0/BUGS
---- pytagsfs-0.6.0~/BUGS 2008-04-22 22:24:37.000000000 +0530
-+++ pytagsfs-0.6.0/BUGS 2008-04-22 22:24:45.000000000 +0530
-@@ -1,6 +1,5 @@
--Please report bugs here:
--
--https://bugs.launchpad.net/pytagsfs/+filebug
-+Please report bugs to the Debian bug tracking system at
-+submit at bugs.debian.org or via the reportbug program.
-
- When you see a bug, copy the file named ".log" under the pytagsfs mount point
- *before* unmounting the filesystem. This file will contain information
-diff -urNad pytagsfs-0.6.0~/pytags.xml pytagsfs-0.6.0/pytags.xml
---- pytagsfs-0.6.0~/pytags.xml 2008-04-22 22:24:37.000000000 +0530
-+++ pytagsfs-0.6.0/pytags.xml 2008-04-22 22:24:45.000000000 +0530
-@@ -141,8 +141,9 @@
- <refsect1>
- <title>Bugs</title>
- <para>
-- Please report bugs on launchpad at
-- http://launchpad.net/products/pytagsfs/+bugs.
-+ See http://bugs.debian.org/src:pytagsfs for a current list.
-+ Bugs may be reported to the Debian bug tracking system at
-+ submit at bugs.debian.org or via the reportbug program.
- </para>
-
- <para>
-diff -urNad pytagsfs-0.6.0~/pytagsfs.xml pytagsfs-0.6.0/pytagsfs.xml
---- pytagsfs-0.6.0~/pytagsfs.xml 2008-04-22 22:24:37.000000000 +0530
-+++ pytagsfs-0.6.0/pytagsfs.xml 2008-04-22 22:25:14.000000000 +0530
-@@ -399,8 +399,9 @@
- <refsect1>
- <title>Bugs</title>
- <para>
-- Please report bugs on launchpad at
-- http://launchpad.net/products/pytagsfs/+bugs.
-+ See http://bugs.debian.org/src:pytagsfs for a current list.
-+ Bugs may be reported to the Debian bug tracking system at
-+ submit at bugs.debian.org or via the reportbug program.
- </para>
- </refsect1>
-
Deleted: packages/pytagsfs/trunk/debian/patches/02_pyinotify_compatibility.dpatch
===================================================================
--- packages/pytagsfs/trunk/debian/patches/02_pyinotify_compatibility.dpatch 2009-10-20 12:52:02 UTC (rev 4009)
+++ packages/pytagsfs/trunk/debian/patches/02_pyinotify_compatibility.dpatch 2009-10-20 12:52:08 UTC (rev 4010)
@@ -1,145 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_pyinotify_compatibility.dpatch by Ritesh Raj Sarraf <rrs at researchut.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Patch to fix failures with newer pyinotify (0.8.6).
-
- at DPATCH@
-diff -urNad pytagsfs-0.9.0~/NEWS pytagsfs-0.9.0/NEWS
---- pytagsfs-0.9.0~/NEWS 2009-03-05 17:20:23.000000000 +0530
-+++ pytagsfs-0.9.0/NEWS 2009-05-16 00:38:41.000000000 +0530
-@@ -5,6 +5,15 @@
- .. contents::
-
-
-+pytagsfs development version
-+============================
-+
-+ * Updated pyinotify source tree monitor to be compatible with new 0.8.6
-+ pyinotify release. This is getting ugly. Thanks to Ritesh Raj Sarraf for
-+ the report and patch. Fixes #364586.
-+ (Forest Bond)
-+
-+
- pytagsfs 0.9.0 2009-03-05
- =========================
-
-diff -urNad pytagsfs-0.9.0~/modules/pytagsfs/sourcetreemon/pyinotify_.py pytagsfs-0.9.0/modules/pytagsfs/sourcetreemon/pyinotify_.py
---- pytagsfs-0.9.0~/modules/pytagsfs/sourcetreemon/pyinotify_.py 2009-03-05 17:20:23.000000000 +0530
-+++ pytagsfs-0.9.0/modules/pytagsfs/sourcetreemon/pyinotify_.py 2009-05-16 00:38:41.000000000 +0530
-@@ -32,6 +32,8 @@
- event_processor = None
- watch_descriptors = None
-
-+ use_timeout_with_check_events = None
-+
- def __init__(self):
- try:
- import pyinotify
-@@ -39,20 +41,34 @@
- raise MissingDependency('pyinotify')
-
- self.pyinotify = pyinotify
-- self.event_mask = (
-- pyinotify.EventsCodes.IN_DELETE |
-- pyinotify.EventsCodes.IN_CREATE |
-- pyinotify.EventsCodes.IN_MOVED_FROM |
-- pyinotify.EventsCodes.IN_MOVED_TO |
-- pyinotify.EventsCodes.IN_MODIFY |
-- pyinotify.EventsCodes.IN_ATTRIB
-- )
-+ try:
-+ self.event_mask = (
-+ pyinotify.IN_DELETE |
-+ pyinotify.IN_CREATE |
-+ pyinotify.IN_MOVED_FROM |
-+ pyinotify.IN_MOVED_TO |
-+ pyinotify.IN_MODIFY |
-+ pyinotify.IN_ATTRIB
-+ )
-+ except AttributeError:
-+ self.event_mask = (
-+ pyinotify.EventsCodes.IN_DELETE |
-+ pyinotify.EventsCodes.IN_CREATE |
-+ pyinotify.EventsCodes.IN_MOVED_FROM |
-+ pyinotify.EventsCodes.IN_MOVED_TO |
-+ pyinotify.EventsCodes.IN_MODIFY |
-+ pyinotify.EventsCodes.IN_ATTRIB
-+ )
-
- self.lock = RLock()
-
- def start(self, debug = False):
- if debug:
-- self.pyinotify.VERBOSE = True
-+ if hasattr(self.pyinotify, 'VERBOSE'):
-+ self.pyinotify.VERBOSE = True
-+ else:
-+ import logging
-+ self.pyinotify.log.setLevel(logging.DEBUG)
-
- self._build_event_processor()
-
-@@ -74,6 +90,12 @@
- def get_event_path(self, event):
- return os.path.join(event.path, event.name)
-
-+ def get_event_is_dir(self, event):
-+ try:
-+ return event.dir
-+ except AttributeError:
-+ return event.is_dir
-+
- @ignore_exceptions(Error)
- def process_default(self, event):
- pass
-@@ -81,17 +103,17 @@
- @ignore_exceptions(Error)
- def _process_add(self, event):
- self.source_tree_mon.add_cb(
-- self.get_event_path(event), event.is_dir)
-+ self.get_event_path(event), self.get_event_is_dir(event))
-
- @ignore_exceptions(Error)
- def _process_remove(self, event):
- self.source_tree_mon.remove_cb(
-- self.get_event_path(event), event.is_dir)
-+ self.get_event_path(event), self.get_event_is_dir(event))
-
- @ignore_exceptions(Error)
- def _process_update(self, event):
- self.source_tree_mon.update_cb(
-- self.get_event_path(event), event.is_dir)
-+ self.get_event_path(event), self.get_event_is_dir(event))
-
- process_IN_DELETE = _process_remove
- process_IN_CREATE = _process_add
-@@ -103,8 +125,13 @@
- self.event_processor = PyInotifyEventProcessor(self)
-
- def _build_notifier(self):
-- self.notifier = self.pyinotify.Notifier(
-- self.watch_manager, self.event_processor)
-+ args = (self.watch_manager, self.event_processor)
-+ try:
-+ self.notifier = self.pyinotify.Notifier(*args, **dict(timeout = 0))
-+ self.use_timeout_with_check_events = False
-+ except TypeError:
-+ self.notifier = self.pyinotify.Notifier(*args)
-+ self.use_timeout_with_check_events = True
-
- @nonatomic(attr_named('lock'))
- def watch_dir(self, real_path):
-@@ -167,7 +194,11 @@
-
- @nonatomic(attr_named('lock'))
- def process_events(self):
-- if self.notifier.check_events(0):
-+ if self.use_timeout_with_check_events:
-+ has_events = self.notifier.check_events(0)
-+ else:
-+ has_events = self.notifier.check_events()
-+ if has_events:
- self.notifier.read_events()
- self.notifier.process_events()
-
More information about the Python-apps-commits
mailing list