aboutsummaryrefslogtreecommitdiff
path: root/utils
diff options
context:
space:
mode:
authorPaul Sokolovsky <paul.sokolovsky@linaro.org>2013-08-19 13:50:08 +0300
committerPaul Sokolovsky <paul.sokolovsky@linaro.org>2013-08-19 13:50:08 +0300
commit6009d9ebc2cd88f7d7c662e38bf5c26eec1b5cbf (patch)
tree9ff778ae9499852e408286c360bc2b8e54bc9fb6 /utils
parent4376f24fd998d69112ac1261629ecf8cabde09a6 (diff)
Look up pinned branch revision only when we know there's description for it.
Saves from KeyErrors.
Diffstat (limited to 'utils')
-rwxr-xr-xutils/manifest-descriptions/manifest-annotate12
1 files changed, 6 insertions, 6 deletions
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: