summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorConley Owens <cco3@android.com>2013-10-16 21:41:33 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2013-10-16 21:41:33 +0000
commit12fd10c20115046dcd2fbe468a45e566f38ffbc9 (patch)
tree071b7878cdcf5ff17b094c8158cf0654efbba1fd
parentfbd3f2a10bf4ddd1f001543c6262c6866a84f0a1 (diff)
parenta17d7af4d9dd9165935a26a9971faed2c05bc278 (diff)
downloadgit-repo-12fd10c20115046dcd2fbe468a45e566f38ffbc9.tar.gz
Merge "Dan't accessing attr of None (`manifest` subcmd)"v1.12.7
-rw-r--r--manifest_xml.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/manifest_xml.py b/manifest_xml.py
index b3ab098d..f1d3edaa 100644
--- a/manifest_xml.py
+++ b/manifest_xml.py
@@ -233,7 +233,9 @@ class XmlManifest(object):
233 e.setAttribute('name', name) 233 e.setAttribute('name', name)
234 if relpath != name: 234 if relpath != name:
235 e.setAttribute('path', relpath) 235 e.setAttribute('path', relpath)
236 remoteName = d.remote.remoteAlias or d.remote.name 236 remoteName = None
237 if d.remote:
238 remoteName = d.remote.remoteAlias or d.remote.name
237 if not d.remote or p.remote.name != remoteName: 239 if not d.remote or p.remote.name != remoteName:
238 e.setAttribute('remote', p.remote.name) 240 e.setAttribute('remote', p.remote.name)
239 if peg_rev: 241 if peg_rev: