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

Move fetch dir calculation to model

Browse Source 
This makes it easier to get this directory name outside of the update
script.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
This commit is contained in:
Paul Eggleton 2013-03-11 02:27:56 +00:00
parent 3cc0b78935
commit f17c5cf04f
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
layerindex/models.py
View File

@ -80,6 +80,15 @@ class LayerItem(models.Model):
return True return True
return False return False
def get_fetch_dir(self):
fetch_dir = ""
for c in self.vcs_url:
if c in '/ .=+?:':
fetch_dir += "_"
else:
fetch_dir += c
return fetch_dir
def get_absolute_url(self): def get_absolute_url(self):
return reverse('layer_item', args=(self.name,)); return reverse('layer_item', args=(self.name,));

17
layerindex/update.py
View File

@ -58,15 +58,6 @@ def runcmd(cmd,destdir=None,printerr=True):
logger.debug("output: %s" % output.rstrip() ) logger.debug("output: %s" % output.rstrip() )
return output return output
def sanitise_path(inpath):
outpath = ""
for c in inpath:
if c in '/ .=+?:':
outpath += "_"
else:
outpath += c
return outpath
def split_bb_file_path(recipe_path, subdir_start): def split_bb_file_path(recipe_path, subdir_start):
if fnmatch.fnmatch(recipe_path, "*.bb"): if fnmatch.fnmatch(recipe_path, "*.bb"):
@ -228,7 +219,7 @@ def main():
# Fetch latest metadata from repositories # Fetch latest metadata from repositories
for layer in layerquery: for layer in layerquery:
# Handle multiple layers in a single repo # Handle multiple layers in a single repo
urldir = sanitise_path(layer.vcs_url) urldir = layer.get_fetch_dir()
repodir = os.path.join(fetchdir, urldir) repodir = os.path.join(fetchdir, urldir)
if not layer.vcs_url in fetchedrepos: if not layer.vcs_url in fetchedrepos:
logger.info("Fetching remote repository %s" % layer.vcs_url) logger.info("Fetching remote repository %s" % layer.vcs_url)
@ -268,7 +259,7 @@ def main():
core_subdir = core_layerbranch.vcs_subdir core_subdir = core_layerbranch.vcs_subdir
else: else:
core_subdir = 'meta' core_subdir = 'meta'
core_urldir = sanitise_path(core_layer.vcs_url) core_urldir = core_layer.get_fetch_dir()
core_repodir = os.path.join(fetchdir, core_urldir) core_repodir = os.path.join(fetchdir, core_urldir)
core_layerdir = os.path.join(core_repodir, core_subdir) core_layerdir = os.path.join(core_repodir, core_subdir)
out = runcmd("git checkout origin/%s" % options.branch, core_repodir) out = runcmd("git checkout origin/%s" % options.branch, core_repodir)
@ -307,7 +298,7 @@ def main():
transaction.enter_transaction_management() transaction.enter_transaction_management()
transaction.managed(True) transaction.managed(True)
try: try:
urldir = sanitise_path(layer.vcs_url) urldir = layer.get_fetch_dir()
repodir = os.path.join(fetchdir, urldir) repodir = os.path.join(fetchdir, urldir)
if layer.vcs_url in failedrepos: if layer.vcs_url in failedrepos:
logger.info("Skipping update of layer %s as fetch of repository %s failed" % (layer.name, layer.vcs_url)) logger.info("Skipping update of layer %s as fetch of repository %s failed" % (layer.name, layer.vcs_url))
@ -382,7 +373,7 @@ def main():
config_data_copy = bb.data.createCopy(tinfoil.config_data) config_data_copy = bb.data.createCopy(tinfoil.config_data)
parse_layer_conf(layerdir, config_data_copy) parse_layer_conf(layerdir, config_data_copy)
for dep in layerbranch.dependencies_set.all(): for dep in layerbranch.dependencies_set.all():
depurldir = sanitise_path(dep.dependency.vcs_url) depurldir = dep.dependency.get_fetch_dir()
deprepodir = os.path.join(fetchdir, depurldir) deprepodir = os.path.join(fetchdir, depurldir)
deplayerbranch = dep.dependency.get_layerbranch(options.branch) deplayerbranch = dep.dependency.get_layerbranch(options.branch)
if not deplayerbranch: if not deplayerbranch: