[27004] in Source-Commits
/svn/athena r25885 - in trunk/debathena/debathena/pyhesiodfs/debian: . patches
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Wed Apr 3 12:49:02 2013
Date: Wed, 3 Apr 2013 12:48:55 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201304031648.r33GmtKF029952@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2013-04-03 12:48:53 -0400 (Wed, 03 Apr 2013)
New Revision: 25885
Added:
trunk/debathena/debathena/pyhesiodfs/debian/patches/catch-traceback-when-starting.patch
Modified:
trunk/debathena/debathena/pyhesiodfs/debian/changelog
trunk/debathena/debathena/pyhesiodfs/debian/patches/series
Log:
In pyhesiodfs:
* Catch tracebacks when starting (Trac: #482)
Modified: trunk/debathena/debathena/pyhesiodfs/debian/changelog
===================================================================
--- trunk/debathena/debathena/pyhesiodfs/debian/changelog 2013-04-03 14:36:46 UTC (rev 25884)
+++ trunk/debathena/debathena/pyhesiodfs/debian/changelog 2013-04-03 16:48:53 UTC (rev 25885)
@@ -1,3 +1,9 @@
+debathena-pyhesiodfs (0.0.r167-0debathena10) unstable; urgency=low
+
+ * Catch tracebacks when starting (Trac: #482)
+
+ -- Jonathan Reed <jdreed@mit.edu> Wed, 03 Apr 2013 12:48:19 -0400
+
debathena-pyhesiodfs (0.0.r167-0debathena9) unstable; urgency=low
* No change rebuild to pick up config-package-dev 4.13 changes
Added: trunk/debathena/debathena/pyhesiodfs/debian/patches/catch-traceback-when-starting.patch
===================================================================
--- trunk/debathena/debathena/pyhesiodfs/debian/patches/catch-traceback-when-starting.patch (rev 0)
+++ trunk/debathena/debathena/pyhesiodfs/debian/patches/catch-traceback-when-starting.patch 2013-04-03 16:48:53 UTC (rev 25885)
@@ -0,0 +1,18 @@
+Index: pyhesiodfs/pyHesiodFS.py
+===================================================================
+--- pyhesiodfs.orig/pyHesiodFS.py 2013-04-03 12:43:59.980979768 -0400
++++ pyhesiodfs/pyHesiodFS.py 2013-04-03 12:46:09.498225631 -0400
+@@ -220,7 +220,12 @@
+ sys.argv.pop(1)
+ server = PyHesiodFS()
+
+- server.main()
++ try:
++ server.main()
++ except fuse.FuseError as fe:
++ print >>sys.stderr, "An error occurred while starting PyHesiodFS:"
++ print >>sys.stderr, fe
++ sys.exit(1)
+
+ if __name__ == '__main__':
+ main()
Modified: trunk/debathena/debathena/pyhesiodfs/debian/patches/series
===================================================================
--- trunk/debathena/debathena/pyhesiodfs/debian/patches/series 2013-04-03 14:36:46 UTC (rev 25884)
+++ trunk/debathena/debathena/pyhesiodfs/debian/patches/series 2013-04-03 16:48:53 UTC (rev 25885)
@@ -1,2 +1,3 @@
install-script-without-extension.patch
no-hello.patch
+catch-traceback-when-starting.patch