[27234] in Source-Commits
Re: /svn/athena r26036 - in trunk/debathena/debathena/pyhesiodfs/debian:
daemon@ATHENA.MIT.EDU (Benjamin Kaduk)
Fri Jun 21 17:17:52 2013
Date: Fri, 21 Jun 2013 17:17:42 -0400 (EDT)
From: Benjamin Kaduk <kaduk@MIT.EDU>
To: Alexander W Dehnert <adehnert@MIT.EDU>
cc: source-commits@MIT.EDU
In-Reply-To: <201306210820.r5L8KnZX011880@drugstore.mit.edu>
Message-ID: <alpine.GSO.1.10.1306211717370.26275@multics.mit.edu>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed
ACK.
-Ben
On Fri, 21 Jun 2013, Alexander W Dehnert wrote:
> Author: adehnert
> Date: 2013-06-21 04:20:49 -0400 (Fri, 21 Jun 2013)
> New Revision: 26036
>
> Added:
> trunk/debathena/debathena/pyhesiodfs/debian/patches/print-err-lockers.patch
> Modified:
> trunk/debathena/debathena/pyhesiodfs/debian/changelog
> trunk/debathena/debathena/pyhesiodfs/debian/patches/series
> Log:
> pyhesiodfs: display ERR lockers (Trac: #1329)
>
> Modified: trunk/debathena/debathena/pyhesiodfs/debian/changelog
> ===================================================================
> --- trunk/debathena/debathena/pyhesiodfs/debian/changelog 2013-06-13 09:30:01 UTC (rev 26035)
> +++ trunk/debathena/debathena/pyhesiodfs/debian/changelog 2013-06-21 08:20:49 UTC (rev 26036)
> @@ -1,3 +1,9 @@
> +debathena-pyhesiodfs (0.0.r167-0debathena11) unstable; urgency=low
> +
> + * Understand and appropriately display ERR lockers (Trac: #1329)
> +
> + -- Alex Dehnert <adehnert@mit.edu> Tue, 18 Jun 2013 18:26:44 -0400
> +
> debathena-pyhesiodfs (0.0.r167-0debathena10) unstable; urgency=low
>
> * Catch tracebacks when starting (Trac: #482)
>
> Added: trunk/debathena/debathena/pyhesiodfs/debian/patches/print-err-lockers.patch
> ===================================================================
> --- trunk/debathena/debathena/pyhesiodfs/debian/patches/print-err-lockers.patch (rev 0)
> +++ trunk/debathena/debathena/pyhesiodfs/debian/patches/print-err-lockers.patch 2013-06-21 08:20:49 UTC (rev 26036)
> @@ -0,0 +1,31 @@
> +commit c4f208b4887f7d336561c10ce4ad7ca6f68dc515
> +Author: Alex Dehnert <adehnert@mit.edu>
> +Date: Tue Jun 18 17:52:23 2013 -0400
> +
> + Print ERR lockers
> +
> +diff --git a/debathena/debathena/pyhesiodfs/pyHesiodFS.py b/debathena/debathena/pyhesiodfs/pyHesiodFS.py
> +index e48ebb1..2e21dba 100644
> +--- a/pyHesiodFS.py
> ++++ b/pyHesiodFS.py
> +@@ -165,13 +165,16 @@ class PyHesiodFS(Fuse):
> + if len(filsys.filsys) >= 1:
> + pointers = filsys.filsys
> + pointer = pointers[0]
> +- if pointer['type'] != 'AFS' and pointer['type'] != 'LOC':
> +- syslog(LOG_NOTICE, "Unknown locker type "+pointer['type']+" for locker "+name+" ("+repr(pointer)+" )")
> +- return None
> +- else:
> ++ if pointer['type'] == 'AFS' or pointer['type'] == 'LOC':
> + self.mounts[self._uid()][name] = pointer['location']
> + syslog(LOG_INFO, "Mounting "+name+" on "+pointer['location'])
> + return pointer['location']
> ++ elif pointer['type'] == 'ERR':
> ++ syslog(LOG_NOTICE, "ERR for locker %s: %s" % (name, pointer['message'], ))
> ++ return None
> ++ else:
> ++ syslog(LOG_NOTICE, "Unknown locker type "+pointer['type']+" for locker "+name+" ("+repr(pointer)+" )")
> ++ return None
> + else:
> + syslog(LOG_WARNING, "Couldn't find filsys for "+name)
> + return None
>
> Modified: trunk/debathena/debathena/pyhesiodfs/debian/patches/series
> ===================================================================
> --- trunk/debathena/debathena/pyhesiodfs/debian/patches/series 2013-06-13 09:30:01 UTC (rev 26035)
> +++ trunk/debathena/debathena/pyhesiodfs/debian/patches/series 2013-06-21 08:20:49 UTC (rev 26036)
> @@ -1,3 +1,4 @@
> install-script-without-extension.patch
> no-hello.patch
> catch-traceback-when-starting.patch
> +print-err-lockers.patch
>
>
