SiegfriedSiegert/PTU5KAS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

repos: remove trailing slash from layer path

Browse Source 
In order for oe-core to correctly display the layers and revisions
used in a build, the paths used in conf/bblayers.conf must have no
trailing path separator.

Signed-off-by: Adrian Stratulat <adrian.stratulat91@gmail.com>
[Jan: fix overlong line, update test case]
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
This commit is contained in:
Adrian Stratulat 2020-09-22 19:31:37 +02:00 committed by Jan Kiszka
parent e4be1a20ff
commit a5c8345ee6
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
kas/repos.py
View File

@ -52,7 +52,8 @@ class Repo:
def __getattr__(self, item): def __getattr__(self, item):
if item == 'layers': if item == 'layers':
return [os.path.join(self.path, layer) for layer in self._layers] return [os.path.join(self.path, layer).rstrip(os.sep)
for layer in self._layers]
elif item == 'qualified_name': elif item == 'qualified_name':
url = urlparse(self.url) url = urlparse(self.url)
return ('{url.netloc}{url.path}' return ('{url.netloc}{url.path}'

2
tests/test_layers.py
View File

@ -42,7 +42,7 @@ def test_layers_default(dokas):
match = 0 match = 0
with open('build/conf/bblayers.conf', 'r') as f: with open('build/conf/bblayers.conf', 'r') as f:
for line in f: for line in f:
if 'test_layers/kas/' in line: if 'test_layers/kas ' in line:
match += 1 match += 1
assert(match == 1) assert(match == 1)