From 6009d9ebc2cd88f7d7c662e38bf5c26eec1b5cbf Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Mon, 19 Aug 2013 13:50:08 +0300 Subject: Look up pinned branch revision only when we know there's description for it. Saves from KeyErrors. --- utils/manifest-descriptions/manifest-annotate | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'utils') diff --git a/utils/manifest-descriptions/manifest-annotate b/utils/manifest-descriptions/manifest-annotate index 0b4d666..b173596 100755 --- a/utils/manifest-descriptions/manifest-annotate +++ b/utils/manifest-descriptions/manifest-annotate @@ -97,15 +97,15 @@ def dump(manifest, out, revision_ref_manifest=None): for p in manifest.get_projects(): name = p.getAttribute("name") remote = p.getAttribute("remote") - if revision_ref_manifest: - # For pinned manifest, we look up branch name for - # this project in source manifest - revision = revision_ref_manifest.get_revision(name, remote) - else: - revision = p.getAttribute("revision") if not remote: remote = manifest.get_default().getAttribute("remote") if (name, remote) in descr_map: + if revision_ref_manifest: + # For pinned manifest, we look up branch name for + # this project in source manifest + revision = revision_ref_manifest.get_revision(name, remote) + else: + revision = p.getAttribute("revision") descr = descr_map[(name, remote)] pd = descr.get("description") if pd: -- cgit v1.2.3