[Python-apps-commits] r1042 - in packages/pytagsfs/trunk/debian (4 files)

[appaji-guest at users.alioth.debian.org]

    Date: Thursday, May 8, 2008 @ 09:39:29
  Author: appaji-guest
Revision: 1042

more generic name for patch -- catches any fuse exception and logs an error

Added:
  packages/pytagsfs/trunk/debian/patches/02_fuse_exceptions.dpatch
    (from rev 1039, packages/pytagsfs/trunk/debian/patches/02_dev_fuse_perms.dpatch)
Modified:
  packages/pytagsfs/trunk/debian/changelog
  packages/pytagsfs/trunk/debian/patches/00list
Deleted:
  packages/pytagsfs/trunk/debian/patches/02_dev_fuse_perms.dpatch

Modified: packages/pytagsfs/trunk/debian/changelog
===================================================================
--- packages/pytagsfs/trunk/debian/changelog	2008-05-08 09:37:31 UTC (rev 1041)
+++ packages/pytagsfs/trunk/debian/changelog	2008-05-08 09:39:29 UTC (rev 1042)
@@ -3,8 +3,8 @@
   * Change Section from python to utils
   * Patch 01_bug_reporting to set the bug reporting location to Debian and not
     upstream.
-  * Patch 02_dev_fuse_perms to catch exception and log an error when the user
-    is not in the fuse group.
+  * Patch 02_fuse_exceptions to catch any exception and log an error when fuse
+    initialisation failis (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
 

Modified: packages/pytagsfs/trunk/debian/patches/00list
===================================================================
--- packages/pytagsfs/trunk/debian/patches/00list	2008-05-08 09:37:31 UTC (rev 1041)
+++ packages/pytagsfs/trunk/debian/patches/00list	2008-05-08 09:39:29 UTC (rev 1042)
@@ -1,2 +1,2 @@
 01_bug_reporting
-02_dev_fuse_perms
+02_fuse_exceptions

Deleted: packages/pytagsfs/trunk/debian/patches/02_dev_fuse_perms.dpatch
===================================================================
--- packages/pytagsfs/trunk/debian/patches/02_dev_fuse_perms.dpatch	2008-05-08 09:37:31 UTC (rev 1041)
+++ packages/pytagsfs/trunk/debian/patches/02_dev_fuse_perms.dpatch	2008-05-08 09:39:29 UTC (rev 1042)
@@ -1,34 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_dev_fuse_perms.dpatch by Y Giridhar Appaji Nag <giridhar at appaji.net>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: catch exception and log error when the user is not in the fuse group.
-
- at DPATCH@
-diff -urNad pytagsfs-0.6.0~/modules/pytagsfs/fs.py pytagsfs-0.6.0/modules/pytagsfs/fs.py
---- pytagsfs-0.6.0~/modules/pytagsfs/fs.py	2008-05-08 15:01:16.000000000 +0530
-+++ pytagsfs-0.6.0/modules/pytagsfs/fs.py	2008-05-08 15:02:41.000000000 +0530
-@@ -45,6 +45,7 @@
-   log_debug,
-   log_info,
-   log_warning,
-+  log_error,
-   set_log_level,
-   DEBUG,
-   INFO,
-@@ -452,8 +453,13 @@
-         except OptParseError, e:
-             self.parser.error(unicode(e))
- 
--        retval = super(FileSystemMappingToRealFiles, self).main()
--        self.source_tree_rep.stop()
-+        try:
-+            retval = super(FileSystemMappingToRealFiles, self).main()
-+        except fuse.FuseError, e:
-+            retval = 1
-+            log_error(unicode(e))
-+        else:
-+            self.source_tree_rep.stop()
-         return retval
- 
-     def parse(self, *args, **kwargs):

Copied: packages/pytagsfs/trunk/debian/patches/02_fuse_exceptions.dpatch (from rev 1039, packages/pytagsfs/trunk/debian/patches/02_dev_fuse_perms.dpatch)
===================================================================
--- packages/pytagsfs/trunk/debian/patches/02_fuse_exceptions.dpatch	                        (rev 0)
+++ packages/pytagsfs/trunk/debian/patches/02_fuse_exceptions.dpatch	2008-05-08 09:39:29 UTC (rev 1042)
@@ -0,0 +1,34 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_dev_fuse_perms.dpatch by Y Giridhar Appaji Nag <giridhar at appaji.net>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: catch exception and log error when the user is not in the fuse group.
+
+ at DPATCH@
+diff -urNad pytagsfs-0.6.0~/modules/pytagsfs/fs.py pytagsfs-0.6.0/modules/pytagsfs/fs.py
+--- pytagsfs-0.6.0~/modules/pytagsfs/fs.py	2008-05-08 15:01:16.000000000 +0530
++++ pytagsfs-0.6.0/modules/pytagsfs/fs.py	2008-05-08 15:02:41.000000000 +0530
+@@ -45,6 +45,7 @@
+   log_debug,
+   log_info,
+   log_warning,
++  log_error,
+   set_log_level,
+   DEBUG,
+   INFO,
+@@ -452,8 +453,13 @@
+         except OptParseError, e:
+             self.parser.error(unicode(e))
+ 
+-        retval = super(FileSystemMappingToRealFiles, self).main()
+-        self.source_tree_rep.stop()
++        try:
++            retval = super(FileSystemMappingToRealFiles, self).main()
++        except fuse.FuseError, e:
++            retval = 1
++            log_error(unicode(e))
++        else:
++            self.source_tree_rep.stop()
+         return retval
+ 
+     def parse(self, *args, **kwargs):