MIRRORS/layerindex-web
1
0
Fork 0
mirror of git://git.yoctoproject.org/layerindex-web.git synced 2025-07-19 20:59:01 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

rrs/tools: Convert unicode strings from Django models to strings.

Browse Source 
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>
This commit is contained in:
Aníbal Limón 2015-07-10 15:28:02 -05:00 committed by Paul Eggleton
parent 1f0935240d
commit d745458018
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rrs/tools/common.py
View File

@ -103,9 +103,9 @@ def load_recipes(layerbranch, bitbakepath, fetchdir, settings, logger,
sys.exit(1) sys.exit(1)
layer = layerbranch.layer layer = layerbranch.layer
urldir = layer.get_fetch_dir() urldir = str(layer.get_fetch_dir())
repodir = os.path.join(fetchdir, urldir) repodir = os.path.join(fetchdir, urldir)
layerdir = os.path.join(repodir, layerbranch.vcs_subdir) layerdir = os.path.join(repodir, str(layerbranch.vcs_subdir))
d = recipeparse.setup_layer(tinfoil.config_data, fetchdir, layerdir, d = recipeparse.setup_layer(tinfoil.config_data, fetchdir, layerdir,
layer, layerbranch) layer, layerbranch)

8
rrs/tools/rrs_upgrade_history.py
View File

@ -140,9 +140,9 @@ def _get_recipes_filenames(ct, repodir, layerdir, logger):
def do_initial(layerbranch, ct, logger): def do_initial(layerbranch, ct, logger):
layer = layerbranch.layer layer = layerbranch.layer
urldir = layer.get_fetch_dir() urldir = str(layer.get_fetch_dir())
repodir = os.path.join(fetchdir, urldir) 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), utils.runcmd("git checkout %s -b %s -f" % (ct, branch_name_tmp),
repodir, logger=logger) repodir, logger=logger)
@ -163,9 +163,9 @@ def do_initial(layerbranch, ct, logger):
def do_loop(layerbranch, ct, logger): def do_loop(layerbranch, ct, logger):
layer = layerbranch.layer layer = layerbranch.layer
urldir = layer.get_fetch_dir() urldir = str(layer.get_fetch_dir())
repodir = os.path.join(fetchdir, urldir) 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), utils.runcmd("git checkout %s -b %s -f" % (ct, branch_name_tmp),
repodir, logger=logger) repodir, logger=logger)