[23611] in Source-Commits
/svn/athena r23245 - in trunk/debathena/debathena/pyhesiodfs: . debian debian/patches
daemon@ATHENA.MIT.EDU (broder@MIT.EDU)
Thu Nov 20 19:18:37 2008
Date: Thu, 20 Nov 2008 19:18:05 -0500 (EST)
From: broder@MIT.EDU
Message-Id: <200811210018.TAA24648@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: broder
Date: 2008-11-20 19:18:03 -0500 (Thu, 20 Nov 2008)
New Revision: 23245
Modified:
trunk/debathena/debathena/pyhesiodfs/debian/changelog
trunk/debathena/debathena/pyhesiodfs/debian/patches/no-hello.patch
trunk/debathena/debathena/pyhesiodfs/pyHesiodFS.py
Log:
In pyhesiodfs, use the syslog instead of printing to stderr
Modified: trunk/debathena/debathena/pyhesiodfs/debian/changelog
===================================================================
--- trunk/debathena/debathena/pyhesiodfs/debian/changelog 2008-11-21 00:09:16 UTC (rev 23244)
+++ trunk/debathena/debathena/pyhesiodfs/debian/changelog 2008-11-21 00:18:03 UTC (rev 23245)
@@ -1,3 +1,9 @@
+debathena-pyhesiodfs (0.0.r157-0debathena1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Evan Broder <broder@mit.edu> Tue, 11 Nov 2008 14:19:15 -0500
+
debathena-pyhesiodfs (0.0.r150-0debathena4) unstable; urgency=low
* If /dev/fuse has group root, restart udev to work around LP #293502.
Modified: trunk/debathena/debathena/pyhesiodfs/debian/patches/no-hello.patch
===================================================================
--- trunk/debathena/debathena/pyhesiodfs/debian/patches/no-hello.patch 2008-11-21 00:09:16 UTC (rev 23244)
+++ trunk/debathena/debathena/pyhesiodfs/debian/patches/no-hello.patch 2008-11-21 00:18:03 UTC (rev 23245)
@@ -1,9 +1,9 @@
-Index: debathena-pyhesiodfs/pyHesiodFS.py
+Index: debathena-pyhesiodfs-0.0.r157/pyHesiodFS.py
===================================================================
---- debathena-pyhesiodfs.orig/pyHesiodFS.py
-+++ debathena-pyhesiodfs/pyHesiodFS.py
-@@ -19,13 +19,6 @@
+--- debathena-pyhesiodfs-0.0.r157.orig/pyHesiodFS.py 2008-11-11 14:20:55.000000000 -0500
++++ debathena-pyhesiodfs-0.0.r157/pyHesiodFS.py 2008-11-11 14:21:15.000000000 -0500
+@@ -20,13 +20,6 @@
fuse.fuse_python_api = (0, 2)
@@ -17,7 +17,7 @@
if not hasattr(fuse, 'Stat'):
fuse.Stat = object
-@@ -68,10 +61,6 @@
+@@ -72,10 +65,6 @@
if path == '/':
st.st_mode = stat.S_IFDIR | 0755
st.st_nlink = 2
@@ -28,7 +28,7 @@
elif '/' not in path[1:]:
if self.findLocker(path[1:]):
st.st_mode = stat.S_IFLNK | 0777
-@@ -111,7 +100,7 @@
+@@ -121,7 +110,7 @@
return None
def getdir(self, path):
@@ -37,7 +37,7 @@
def readdir(self, path, offset):
for (r, zero) in self.getdir(path):
-@@ -120,27 +109,7 @@
+@@ -130,27 +119,7 @@
def readlink(self, path):
return self.findLocker(path[1:])
@@ -65,7 +65,7 @@
try:
usage = Fuse.fusage
server = PyHesiodFS(version="%prog " + fuse.__version__,
-@@ -156,7 +125,6 @@
+@@ -166,7 +135,6 @@
sys.argv.pop(1)
server = PyHesiodFS()
Modified: trunk/debathena/debathena/pyhesiodfs/pyHesiodFS.py
===================================================================
--- trunk/debathena/debathena/pyhesiodfs/pyHesiodFS.py 2008-11-21 00:09:16 UTC (rev 23244)
+++ trunk/debathena/debathena/pyhesiodfs/pyHesiodFS.py 2008-11-21 00:18:03 UTC (rev 23245)
@@ -10,6 +10,7 @@
#
import sys, os, stat, errno
+from syslog import *
import fuse
from fuse import Fuse
@@ -51,6 +52,9 @@
def __init__(self, *args, **kwargs):
Fuse.__init__(self, *args, **kwargs)
+
+ openlog('pyhesiodfs', 0, LOG_DAEMON)
+
try:
self.fuse_args.add("allow_other", True)
except AttributeError:
@@ -106,14 +110,14 @@
pointers = filsys.filsys
pointer = pointers[0]
if pointer['type'] != 'AFS' and pointer['type'] != 'LOC':
- print >>sys.stderr, "Unknown locker type "+pointer.type+" for locker "+name+" ("+repr(pointer)+" )"
+ syslog(LOG_NOTICE, "Unknown locker type "+pointer['type']+" for locker "+name+" ("+repr(pointer)+" )")
return None
else:
self.mounts[name] = pointer['location']
- print >>sys.stderr, "Mounting "+name+" on "+pointer['location']
+ syslog(LOG_INFO, "Mounting "+name+" on "+pointer['location'])
return pointer['location']
else:
- print >>sys.stderr, "Couldn't find filsys for "+name
+ syslog(LOG_WARNING, "Couldn't find filsys for "+name)
return None
def getdir(self, path):
