Commit dcdeb3bd by willmcgugan

Read fix for getmeta in rpcfs

parent 60941151
...@@ -48,7 +48,7 @@ class RPCFSInterface(object): ...@@ -48,7 +48,7 @@ class RPCFSInterface(object):
def getmeta_default(self, meta_name, default): def getmeta_default(self, meta_name, default):
meta = self.fs.getmeta(meta_name, default) meta = self.fs.getmeta(meta_name, default)
return xmlrpclib.Binary(meta) return meta
def hasmeta(self, meta_name): def hasmeta(self, meta_name):
return self.fs.hasmeta(meta_name) return self.fs.hasmeta(meta_name)
......
...@@ -145,12 +145,10 @@ class RPCFS(FS): ...@@ -145,12 +145,10 @@ class RPCFS(FS):
return path.decode("base64").decode("utf8") return path.decode("base64").decode("utf8")
def getmeta(self, meta_name, default=NoDefaultMeta): def getmeta(self, meta_name, default=NoDefaultMeta):
try: if default is NoDefaultMeta:
return self.proxy.getmeta(meta_name) return self.proxy.getmeta(meta_name)
except NoMetaError: else:
if default is not NoDefaultMeta: return self.proxy.getmeta_default(meta_name, default)
return default
raise
def hasmeta(self, meta_name): def hasmeta(self, meta_name):
return self.proxy.hasmeta(meta_name) return self.proxy.hasmeta(meta_name)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment