diff options
Diffstat (limited to 'bitbake/lib')
-rw-r--r-- | bitbake/lib/bb/ui/buildinfohelper.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/bitbake/lib/bb/ui/buildinfohelper.py b/bitbake/lib/bb/ui/buildinfohelper.py index 22469607d6..b2c74ddf7a 100644 --- a/bitbake/lib/bb/ui/buildinfohelper.py +++ b/bitbake/lib/bb/ui/buildinfohelper.py | |||
@@ -451,7 +451,11 @@ class ORMWrapper(object): | |||
451 | # note that this is different | 451 | # note that this is different |
452 | buildrequest = BuildRequest.objects.get(pk = br_id) | 452 | buildrequest = BuildRequest.objects.get(pk = br_id) |
453 | for brl in buildrequest.brlayer_set.all(): | 453 | for brl in buildrequest.brlayer_set.all(): |
454 | localdirname = os.path.join(bc.getGitCloneDirectory(brl.giturl, brl.commit), brl.dirpath) | 454 | if brl.local_source_dir: |
455 | localdirname = os.path.join(brl.local_source_dir, | ||
456 | brl.dirpath) | ||
457 | else: | ||
458 | localdirname = os.path.join(bc.getGitCloneDirectory(brl.giturl, brl.commit), brl.dirpath) | ||
455 | # we get a relative path, unless running in HEAD mode where the path is absolute | 459 | # we get a relative path, unless running in HEAD mode where the path is absolute |
456 | if not localdirname.startswith("/"): | 460 | if not localdirname.startswith("/"): |
457 | localdirname = os.path.join(bc.be.sourcedir, localdirname) | 461 | localdirname = os.path.join(bc.be.sourcedir, localdirname) |
@@ -981,8 +985,6 @@ class BuildInfoHelper(object): | |||
981 | def _get_layer_version_for_path(self, path): | 985 | def _get_layer_version_for_path(self, path): |
982 | self._ensure_build() | 986 | self._ensure_build() |
983 | 987 | ||
984 | assert path.startswith("/") | ||
985 | |||
986 | def _slkey_interactive(layer_version): | 988 | def _slkey_interactive(layer_version): |
987 | assert isinstance(layer_version, Layer_Version) | 989 | assert isinstance(layer_version, Layer_Version) |
988 | return len(layer_version.local_path) | 990 | return len(layer_version.local_path) |