[ARVADOS] updated: 1.3.0-1105-gecea0fa10
Git user
git at public.curoverse.com
Mon Jun 24 15:34:23 UTC 2019
Summary of changes:
services/fuse/arvados_fuse/command.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
via ecea0fa102bea186e752b20386c4a59d86ec7c92 (commit)
from d6f2d88621fb4f70674e669fe92df23f3e866dc4 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit ecea0fa102bea186e752b20386c4a59d86ec7c92
Author: Eric Biagiotti <ebiagiotti at veritasgenetics.com>
Date: Mon Jun 24 11:34:18 2019 -0400
14965: Fix for inflexible llfuse function parameter
Arvados-DCO-1.1-Signed-off-by: Eric Biagiotti <ebiagiotti at veritasgenetics.com>
llfuse.init expects the native str type in bother python 2 and 3, so the builtins.str type cannot be used.
diff --git a/services/fuse/arvados_fuse/command.py b/services/fuse/arvados_fuse/command.py
index 14b1327d9..76449729d 100644
--- a/services/fuse/arvados_fuse/command.py
+++ b/services/fuse/arvados_fuse/command.py
@@ -2,8 +2,8 @@
#
# SPDX-License-Identifier: AGPL-3.0
+from future.utils import native_str
from builtins import range
-from builtins import str
from builtins import object
import argparse
import arvados
@@ -137,7 +137,7 @@ class Mount(object):
if self.args.replace:
unmount(path=self.args.mountpoint,
timeout=self.args.unmount_timeout)
- llfuse.init(self.operations, self.args.mountpoint.encode('utf-8'), self._fuse_options())
+ llfuse.init(self.operations, native_str(self.args.mountpoint), self._fuse_options())
if self.daemon:
daemon.DaemonContext(
working_directory=os.path.dirname(self.args.mountpoint),
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list