[Python-apps-commits] r2950 - in packages/pytagsfs/tags (10 files)
rrs-guest at users.alioth.debian.org
rrs-guest at users.alioth.debian.org
Sat May 16 18:30:22 UTC 2009
Date: Saturday, May 16, 2009 @ 18:30:22
Author: rrs-guest
Revision: 2950
Tagging 0.9.0-2 Unstable release
Added:
packages/pytagsfs/tags/0.9.0-2/
packages/pytagsfs/tags/0.9.0-2/debian/
packages/pytagsfs/tags/0.9.0-2/debian/changelog
(from rev 2944, packages/pytagsfs/trunk/debian/changelog)
packages/pytagsfs/tags/0.9.0-2/debian/control
(from rev 2944, packages/pytagsfs/trunk/debian/control)
packages/pytagsfs/tags/0.9.0-2/debian/patches/00list
(from rev 2944, packages/pytagsfs/trunk/debian/patches/00list)
packages/pytagsfs/tags/0.9.0-2/debian/patches/02_pyinotify_compatibility.dpatch
(from rev 2946, packages/pytagsfs/trunk/debian/patches/02_pyinotify_compatibility.dpatch)
Deleted:
packages/pytagsfs/tags/0.9.0-2/debian/
packages/pytagsfs/tags/0.9.0-2/debian/changelog
packages/pytagsfs/tags/0.9.0-2/debian/control
packages/pytagsfs/tags/0.9.0-2/debian/patches/00list
Deleted: packages/pytagsfs/tags/0.9.0-2/debian/changelog
===================================================================
--- packages/pytagsfs/trunk/debian/changelog 2009-05-15 14:35:32 UTC (rev 2943)
+++ packages/pytagsfs/tags/0.9.0-2/debian/changelog 2009-05-16 18:30:22 UTC (rev 2950)
@@ -1,70 +0,0 @@
-pytagsfs (0.9.0-2) unstable; urgency=low
-
- [ Y Giridhar Appaji Nag ]
- * Add Ritesh Raj Sarraf <rrs at researchut.com> to Uploaders
-
- [ Ritesh Raj Sarraf ]
- * Strict dependency on python-pyinotify (<= 0.7.1). The newer versions are
- incompatible.
- * Take maintenance from Y Giridhar Appaji Nag.
-
- -- Ritesh Raj Sarraf <rrs at researchut.com> Sun, 03 May 2009 14:48:08 +0530
-
-pytagsfs (0.9.0-1) unstable; urgency=low
-
- * New upstream release
-
- -- Y Giridhar Appaji Nag <appaji at debian.org> Sat, 07 Mar 2009 11:14:59 +0530
-
-pytagsfs (0.9.0~rc1-1) unstable; urgency=low
-
- * New upstream release
- + Needs python-fuse to build add to Build-Depends
-
- -- Y Giridhar Appaji Nag <appaji at debian.org> Wed, 28 Jan 2009 22:11:56 +0530
-
-pytagsfs (0.8.0-1) unstable; urgency=low
-
- [ Sandro Tosi ]
- * debian/control
- - switch Vcs-Browser field to viewsvn
-
- [ Y Giridhar Appaji Nag ]
- * New upstream release
- * Add README.source to be compliant with policy 3.8.0
- * Update Maintainer: to official Debian ID
- * Add python-libxml2 to Build-Depends-Indep:
-
- -- Y Giridhar Appaji Nag <appaji at debian.org> Sat, 22 Nov 2008 23:05:28 +0530
-
-pytagsfs (0.7.1-2) unstable; urgency=low
-
- * We need fusermount hence depend on fuse-utils
-
- -- Y Giridhar Appaji Nag <giridhar at appaji.net> Fri, 15 Aug 2008 16:14:36 +0530
-
-pytagsfs (0.7.1-1) unstable; urgency=low
-
- * New upstream release
- + Depends on python-fuse >= 0.2 and python-sclapp >= 0.5.2
- + Build-Depends also on python-sclapp >= 0.5.2
- * Remove patch 02_fuse_exceptions merged upstream
- * Update Standards-Version to 3.8.0 (no changes required)
-
- -- Y Giridhar Appaji Nag <giridhar at appaji.net> Sun, 03 Aug 2008 16:07:34 +0530
-
-pytagsfs (0.6.0-2) unstable; urgency=low
-
- * Change Section from python to utils
- * Patch 01_bug_reporting to set the bug reporting location to Debian and not
- upstream.
- * Patch 02_fuse_exceptions to catch any exception and log an error when fuse
- initialisation fails (like the user is not in the fuse group).
-
- -- Y Giridhar Appaji Nag <giridhar at appaji.net> Wed, 30 Apr 2008 17:22:28 +0530
-
-pytagsfs (0.6.0-1) unstable; urgency=low
-
- * Initial release (Closes: #471971)
-
- -- Y Giridhar Appaji Nag <giridhar at appaji.net> Sat, 05 Apr 2008 19:42:17 +0530
Copied: packages/pytagsfs/tags/0.9.0-2/debian/changelog (from rev 2944, packages/pytagsfs/trunk/debian/changelog)
===================================================================
--- packages/pytagsfs/tags/0.9.0-2/debian/changelog (rev 0)
+++ packages/pytagsfs/tags/0.9.0-2/debian/changelog 2009-05-16 18:30:22 UTC (rev 2950)
@@ -0,0 +1,67 @@
+pytagsfs (0.9.0-2) unstable; urgency=low
+
+ * Take maintenance from Y Giridhar Appaji Nag
+ * Pull patch 02_pyinotify_compatibility.dpatch from upstream
+ to fix compatibility issues with newer, backwards incompatible, pyinotify
+ * Bump Standards Version to 3.8.1 (No changes required)
+
+ -- Ritesh Raj Sarraf <rrs at researchut.com> Sat, 16 May 2009 00:47:09 +0530
+
+pytagsfs (0.9.0-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Y Giridhar Appaji Nag <appaji at debian.org> Sat, 07 Mar 2009 11:14:59 +0530
+
+pytagsfs (0.9.0~rc1-1) unstable; urgency=low
+
+ * New upstream release
+ + Needs python-fuse to build add to Build-Depends
+
+ -- Y Giridhar Appaji Nag <appaji at debian.org> Wed, 28 Jan 2009 22:11:56 +0530
+
+pytagsfs (0.8.0-1) unstable; urgency=low
+
+ [ Sandro Tosi ]
+ * debian/control
+ - switch Vcs-Browser field to viewsvn
+
+ [ Y Giridhar Appaji Nag ]
+ * New upstream release
+ * Add README.source to be compliant with policy 3.8.0
+ * Update Maintainer: to official Debian ID
+ * Add python-libxml2 to Build-Depends-Indep:
+
+ -- Y Giridhar Appaji Nag <appaji at debian.org> Sat, 22 Nov 2008 23:05:28 +0530
+
+pytagsfs (0.7.1-2) unstable; urgency=low
+
+ * We need fusermount hence depend on fuse-utils
+
+ -- Y Giridhar Appaji Nag <giridhar at appaji.net> Fri, 15 Aug 2008 16:14:36 +0530
+
+pytagsfs (0.7.1-1) unstable; urgency=low
+
+ * New upstream release
+ + Depends on python-fuse >= 0.2 and python-sclapp >= 0.5.2
+ + Build-Depends also on python-sclapp >= 0.5.2
+ * Remove patch 02_fuse_exceptions merged upstream
+ * Update Standards-Version to 3.8.0 (no changes required)
+
+ -- Y Giridhar Appaji Nag <giridhar at appaji.net> Sun, 03 Aug 2008 16:07:34 +0530
+
+pytagsfs (0.6.0-2) unstable; urgency=low
+
+ * Change Section from python to utils
+ * Patch 01_bug_reporting to set the bug reporting location to Debian and not
+ upstream.
+ * Patch 02_fuse_exceptions to catch any exception and log an error when fuse
+ initialisation fails (like the user is not in the fuse group).
+
+ -- Y Giridhar Appaji Nag <giridhar at appaji.net> Wed, 30 Apr 2008 17:22:28 +0530
+
+pytagsfs (0.6.0-1) unstable; urgency=low
+
+ * Initial release (Closes: #471971)
+
+ -- Y Giridhar Appaji Nag <giridhar at appaji.net> Sat, 05 Apr 2008 19:42:17 +0530
Deleted: packages/pytagsfs/tags/0.9.0-2/debian/control
===================================================================
--- packages/pytagsfs/trunk/debian/control 2009-05-15 14:35:32 UTC (rev 2943)
+++ packages/pytagsfs/tags/0.9.0-2/debian/control 2009-05-16 18:30:22 UTC (rev 2950)
@@ -1,27 +0,0 @@
-Source: pytagsfs
-Section: utils
-Priority: optional
-Maintainer: Ritesh Raj Sarraf <rrs at researchut.com>
-Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>,
- Y Giridhar Appaji Nag <appaji at debian.org>
-Build-Depends: debhelper (>= 5.0.38), dpatch
-Build-Depends-Indep: python-central (>= 0.5.6), python-sclapp (>= 0.5.2), xsltproc, docbook-xsl, python-libxml2, python-fuse (>= 0.2)
-Standards-Version: 3.8.0
-XS-Python-Version: all
-Homepage: http://www.pytagsfs.org/
-Vcs-Svn: svn://svn.debian.org/svn/python-apps/packages/pytagsfs/trunk
-Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/pytagsfs/trunk/
-
-Package: pytagsfs
-Architecture: all
-Depends: ${python:Depends}, python-fuse (>= 0.2), python-pyinotify (<= 0.7.2), python-mutagen, python-sclapp (>= 0.5.2), fuse-utils
-XB-Python-Version: ${python:Versions}
-Description: maps media files to an arbitrary directory structure
- pytagsfs is a FUSE filesystem that arranges media files in a virtual directory
- structure based on the file tags.
- .
- A set of audio files could be mapped to a new directory structure organizing
- them hierarchically by album, genre, release date, etc.
- .
- File tags can be changed by moving and renaming virtual files and directories.
- The virtual files can be modified, opened and played just like regular files.
Copied: packages/pytagsfs/tags/0.9.0-2/debian/control (from rev 2944, packages/pytagsfs/trunk/debian/control)
===================================================================
--- packages/pytagsfs/tags/0.9.0-2/debian/control (rev 0)
+++ packages/pytagsfs/tags/0.9.0-2/debian/control 2009-05-16 18:30:22 UTC (rev 2950)
@@ -0,0 +1,26 @@
+Source: pytagsfs
+Section: utils
+Priority: optional
+Maintainer: Ritesh Raj Sarraf <rrs at researchut.com>
+Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>, Y Giridhar Appaji Nag <appaji at debian.org>
+Build-Depends: debhelper (>= 5.0.38), dpatch
+Build-Depends-Indep: python-central (>= 0.5.6), python-sclapp (>= 0.5.2), xsltproc, docbook-xsl, python-libxml2, python-fuse (>= 0.2)
+Standards-Version: 3.8.1
+XS-Python-Version: all
+Homepage: http://www.pytagsfs.org/
+Vcs-Svn: svn://svn.debian.org/svn/python-apps/packages/pytagsfs/trunk
+Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/pytagsfs/trunk/
+
+Package: pytagsfs
+Architecture: all
+Depends: ${python:Depends}, python-fuse (>= 0.2), python-pyinotify, python-mutagen, python-sclapp (>= 0.5.2), fuse-utils
+XB-Python-Version: ${python:Versions}
+Description: maps media files to an arbitrary directory structure
+ pytagsfs is a FUSE filesystem that arranges media files in a virtual directory
+ structure based on the file tags.
+ .
+ A set of audio files could be mapped to a new directory structure organizing
+ them hierarchically by album, genre, release date, etc.
+ .
+ File tags can be changed by moving and renaming virtual files and directories.
+ The virtual files can be modified, opened and played just like regular files.
Deleted: packages/pytagsfs/tags/0.9.0-2/debian/patches/00list
===================================================================
--- packages/pytagsfs/trunk/debian/patches/00list 2009-05-15 14:35:32 UTC (rev 2943)
+++ packages/pytagsfs/tags/0.9.0-2/debian/patches/00list 2009-05-16 18:30:22 UTC (rev 2950)
@@ -1 +0,0 @@
-01_bug_reporting
Copied: packages/pytagsfs/tags/0.9.0-2/debian/patches/00list (from rev 2944, packages/pytagsfs/trunk/debian/patches/00list)
===================================================================
--- packages/pytagsfs/tags/0.9.0-2/debian/patches/00list (rev 0)
+++ packages/pytagsfs/tags/0.9.0-2/debian/patches/00list 2009-05-16 18:30:22 UTC (rev 2950)
@@ -0,0 +1,2 @@
+01_bug_reporting
+02_pyinotify_compatibility
Copied: packages/pytagsfs/tags/0.9.0-2/debian/patches/02_pyinotify_compatibility.dpatch (from rev 2946, packages/pytagsfs/trunk/debian/patches/02_pyinotify_compatibility.dpatch)
===================================================================
--- packages/pytagsfs/tags/0.9.0-2/debian/patches/02_pyinotify_compatibility.dpatch (rev 0)
+++ packages/pytagsfs/tags/0.9.0-2/debian/patches/02_pyinotify_compatibility.dpatch 2009-05-16 18:30:22 UTC (rev 2950)
@@ -0,0 +1,145 @@
+#! /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