summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/cleanup-workdir2
-rwxr-xr-xscripts/combo-layer2
-rwxr-xr-xscripts/oe-selftest2
3 files changed, 3 insertions, 3 deletions
diff --git a/scripts/cleanup-workdir b/scripts/cleanup-workdir
index fee464c31d..0b2cf99d78 100755
--- a/scripts/cleanup-workdir
+++ b/scripts/cleanup-workdir
@@ -45,7 +45,7 @@ def run_command(cmd):
45 if pipe.returncode != 0: 45 if pipe.returncode != 0:
46 print("Execute command '%s' failed." % cmd) 46 print("Execute command '%s' failed." % cmd)
47 sys.exit(1) 47 sys.exit(1)
48 return output 48 return output.decode('utf-8')
49 49
50def get_cur_arch_dirs(workdir, arch_dirs): 50def get_cur_arch_dirs(workdir, arch_dirs):
51 pattern = workdir + '/(.*?)/' 51 pattern = workdir + '/(.*?)/'
diff --git a/scripts/combo-layer b/scripts/combo-layer
index 36a8f5fa1e..eaa7f5adb8 100755
--- a/scripts/combo-layer
+++ b/scripts/combo-layer
@@ -198,7 +198,7 @@ def runcmd(cmd,destdir=None,printerr=True,out=None,env=None):
198 raise e 198 raise e
199 199
200 err.seek(0) 200 err.seek(0)
201 output = err.read() 201 output = err.read().decode('utf-8')
202 logger.debug("output: %s" % output.replace(chr(0), '\\0')) 202 logger.debug("output: %s" % output.replace(chr(0), '\\0'))
203 return output 203 return output
204 204
diff --git a/scripts/oe-selftest b/scripts/oe-selftest
index b1ecf7f322..df76f94f7a 100755
--- a/scripts/oe-selftest
+++ b/scripts/oe-selftest
@@ -371,7 +371,7 @@ def coverage_setup(coverage_source, coverage_include, coverage_omit):
371 import subprocess 371 import subprocess
372 builddir = os.environ.get("BUILDDIR") 372 builddir = os.environ.get("BUILDDIR")
373 pokydir = os.path.dirname(os.path.dirname(os.path.realpath(__file__))) 373 pokydir = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
374 curcommit= subprocess.check_output(["git", "--git-dir", os.path.join(pokydir, ".git"), "rev-parse", "HEAD"]) 374 curcommit= subprocess.check_output(["git", "--git-dir", os.path.join(pokydir, ".git"), "rev-parse", "HEAD"]).decode('utf-8')
375 coveragerc = "%s/.coveragerc" % builddir 375 coveragerc = "%s/.coveragerc" % builddir
376 data_file = "%s/.coverage." % builddir 376 data_file = "%s/.coverage." % builddir
377 data_file += datetime.datetime.now().strftime('%Y%m%dT%H%M%S') 377 data_file += datetime.datetime.now().strftime('%Y%m%dT%H%M%S')