From 7822a4c315774a0d8b27a7985b59ed5db0523a39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=AD=20Bol=C3=ADvar?= Date: Wed, 15 Jan 2020 16:34:03 -0800 Subject: [PATCH] manifest: fix _manifest_content_at() for trees MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We need to print the contents of the directory at manifest-rev, NOT project.revision. Signed-off-by: Martí Bolívar --- src/west/manifest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/west/manifest.py b/src/west/manifest.py index f62e5fc..60ae9ca 100644 --- a/src/west/manifest.py +++ b/src/west/manifest.py @@ -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. ret = [] 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), rev=rev).decode('utf-8')) return ret