aboutsummaryrefslogtreecommitdiffstats
path: root/rrs/tools/rrs_upgrade_history.py
diff options
context:
space:
mode:
authorAníbal Limón <anibal.limon@linux.intel.com>2015-07-10 15:28:02 -0500
committerPaul Eggleton <paul.eggleton@linux.intel.com>2018-05-04 23:57:52 +1200
commitd7454580186a7b8f756e3c3cc3dbfb1354cfb4d5 (patch)
tree9e941a895321fb423682d9ee24d3b355c29be540 /rrs/tools/rrs_upgrade_history.py
parent1f0935240d5e5bc36f7da4fbb828229112c599f7 (diff)
downloadopenembedded-core-contrib-d7454580186a7b8f756e3c3cc3dbfb1354cfb4d5.tar.gz
rrs/tools: Convert unicode strings from Django models to strings.
bb.cache.Cache.loadDatafull() expects an filepath in asciii, if not is provided it fails with character mapping error. Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
Diffstat (limited to 'rrs/tools/rrs_upgrade_history.py')
-rwxr-xr-xrrs/tools/rrs_upgrade_history.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/rrs/tools/rrs_upgrade_history.py b/rrs/tools/rrs_upgrade_history.py
index ee0aa0c31d..65ae6258d3 100755
--- a/rrs/tools/rrs_upgrade_history.py
+++ b/rrs/tools/rrs_upgrade_history.py
@@ -140,9 +140,9 @@ def _get_recipes_filenames(ct, repodir, layerdir, logger):
def do_initial(layerbranch, ct, logger):
layer = layerbranch.layer
- urldir = layer.get_fetch_dir()
+ urldir = str(layer.get_fetch_dir())
repodir = os.path.join(fetchdir, urldir)
- layerdir = os.path.join(repodir, layerbranch.vcs_subdir)
+ layerdir = os.path.join(repodir, str(layerbranch.vcs_subdir))
utils.runcmd("git checkout %s -b %s -f" % (ct, branch_name_tmp),
repodir, logger=logger)
@@ -163,9 +163,9 @@ def do_initial(layerbranch, ct, logger):
def do_loop(layerbranch, ct, logger):
layer = layerbranch.layer
- urldir = layer.get_fetch_dir()
+ urldir = str(layer.get_fetch_dir())
repodir = os.path.join(fetchdir, urldir)
- layerdir = os.path.join(repodir, layerbranch.vcs_subdir)
+ layerdir = os.path.join(repodir, str(layerbranch.vcs_subdir))
utils.runcmd("git checkout %s -b %s -f" % (ct, branch_name_tmp),
repodir, logger=logger)