OrgZephyr/west
OrgZephyr
/
west
mirror of https://github.com/zephyrproject-rtos/west.git
1
0
Fork 0
Code Issues Releases Wiki Activity

manifest: fix _manifest_content_at() for trees 

We need to print the contents of the directory at manifest-rev, NOT
project.revision.

Signed-off-by: Martí Bolívar <marti.bolivar@nordicsemi.no>
This commit is contained in:
Martí Bolívar 2020-01-15 16:34:03 -08:00 committed by Marti Bolivar
parent ca56fce8c8
commit 7822a4c315
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/west/manifest.py
View File

@ -1454,7 +1454,7 @@ def _manifest_content_at(project, path, rev=QUAL_MANIFEST_REV_BRANCH):
# Importing a tree: return the content of the YAML files inside it. # Importing a tree: return the content of the YAML files inside it.
ret = [] ret = []
pathobj = PurePath(path) pathobj = PurePath(path)
for f in filter(_is_yml, project.listdir_at(path)): for f in filter(_is_yml, project.listdir_at(path, rev=rev)):
ret.append(project.read_at(str(pathobj / f), ret.append(project.read_at(str(pathobj / f),
rev=rev).decode('utf-8')) rev=rev).decode('utf-8'))
return ret return ret