summaryrefslogtreecommitdiffstats
path: root/lib/bb/ui/buildinfohelper.py
diff options
context:
space:
mode:
authorAlexandru DAMIAN <alexandru.damian@intel.com>2015-03-11 14:17:21 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-03-16 17:43:51 +0000
commit253d69e88fd68729196ad43c15e8733527d76198 (patch)
tree6bbc7d9dbe6b93073b7cc08949d812224f5be350 /lib/bb/ui/buildinfohelper.py
parent61b0f0e46a589af9d669e52d4cec656bbd0d0057 (diff)
downloadopenembedded-core-contrib-253d69e88fd68729196ad43c15e8733527d76198.tar.gz
toasterui: relative recipe paths
We modify the toasterui to log relative recipe paths in order to maintain consistency with data fetched from the layer sources. Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com>
Diffstat (limited to 'lib/bb/ui/buildinfohelper.py')
-rw-r--r--lib/bb/ui/buildinfohelper.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/bb/ui/buildinfohelper.py b/lib/bb/ui/buildinfohelper.py
index ae2ac9fee5..cf8c444fdf 100644
--- a/lib/bb/ui/buildinfohelper.py
+++ b/lib/bb/ui/buildinfohelper.py
@@ -221,6 +221,9 @@ class ORMWrapper(object):
assert 'layer_version' in recipe_information
assert 'file_path' in recipe_information
+ if recipe_information['file_path'].startswith(recipe_information['layer_version'].layer.local_path):
+ recipe_information['file_path'] = recipe_information['file_path'][len(recipe_information['layer_version'].layer.local_path):].lstrip("/")
+
recipe_object, created = self._cached_get_or_create(Recipe, layer_version=recipe_information['layer_version'],
file_path=recipe_information['file_path'])
if created and must_exist:
@@ -289,7 +292,10 @@ class ORMWrapper(object):
# we matched the BRLayer, but we need the layer_version that generated this BR; reverse of the Project.schedule_build()
for pl in buildrequest.project.projectlayer_set.filter(layercommit__layer__name = brl.name):
if pl.layercommit.layer.vcs_url == brl.giturl :
- return pl.layercommit.layer
+ layer = pl.layercommit.layer
+ layer.local_path = layer_information['local_path']
+ layer.save()
+ return layer
raise Exception("Unidentified layer %s" % pformat(layer_information))