From 69c0398c559654ea05b9dfe35968112b4ff801f6 Mon Sep 17 00:00:00 2001 From: Torben Hohn Date: Tue, 13 Oct 2015 18:36:49 +0200 Subject: [PATCH] elbeproject: make a string from builddir parameter prevents a failure down the road due to paths being unicode: Traceback (most recent call last): File "/var/cache/elbe/devel/elbepack/asyncworker.py", line 86, in execute self.project.build(skip_pkglist=True, build_bin=self.build_bin, build_sources=self.build_src) File "/var/cache/elbe/devel/elbepack/elbeproject.py", line 216, in build reportpath, self.targetfs ) File "/var/cache/elbe/devel/elbepack/dump.py", line 193, in elbe_report mt_index = targetfs.mtime_snap() File "/var/cache/elbe/devel/elbepack/filesystem.py", line 170, in mtime_snap for fpath, realpath in self.walk_files(dirname,exclude_dirs): File "/var/cache/elbe/devel/elbepack/filesystem.py", line 148, in walk_files for dirpath, dirnames, filenames in os.walk(dirname): File "/usr/lib/python2.7/os.py", line 294, in walk for x in walk(new_path, topdown, onerror, followlinks): File "/usr/lib/python2.7/os.py", line 294, in walk for x in walk(new_path, topdown, onerror, followlinks): File "/usr/lib/python2.7/os.py", line 294, in walk for x in walk(new_path, topdown, onerror, followlinks): File "/usr/lib/python2.7/os.py", line 284, in walk if isdir(join(top, name)): File "/usr/lib/python2.7/posixpath.py", line 80, in join path += '/' + b UnicodeDecodeError: 'ascii' codec can't decode byte 0xc4 in position 35: ordinal not in range(128) Signed-off-by: Torben Hohn --- elbepack/elbeproject.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/elbepack/elbeproject.py b/elbepack/elbeproject.py index fc4ca8244a..0aece17016 100644 --- a/elbepack/elbeproject.py +++ b/elbepack/elbeproject.py @@ -54,7 +54,7 @@ def __init__ (self, builddir, xmlpath = None, logpath = None, name = None, skip_urlcheck = False, rpcaptcache_notifier = None, private_data = None, postbuild_file = None, presh_file = None, postsh_file = None, savesh_file = None): - self.builddir = os.path.abspath(builddir) + self.builddir = os.path.abspath(str(builddir)) self.chrootpath = os.path.join(self.builddir, "chroot") self.targetpath = os.path.join(self.builddir, "target")