From 1e7ab2a63f7ec53aa649015dff8d46ad2501d993 Mon Sep 17 00:00:00 2001 From: Conley Owens Date: Tue, 8 Oct 2013 17:26:57 -0700 Subject: [PATCH] Respect remote aliases Previously, change I7150e449341ed8655d398956a095261978d95870 had broken alias support in order to fix the manifest command to keep it from spitting projects that point to an alias that wasn't recorded. This commit reverts that commit and instead solves the issue more correctly, outputting the alias in the remote node of the manifest and respecting that alias when outputting the list of projects. Change-Id: I941fc4adb7121d2e61cedc5838e80d3918c977c3 --- manifest_xml.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/manifest_xml.py b/manifest_xml.py index e40e6fac..bdbb1d40 100644 --- a/manifest_xml.py +++ b/manifest_xml.py @@ -91,6 +91,8 @@ class _XmlRemote(object): def ToRemoteSpec(self, projectName): url = self.resolvedFetchUrl.rstrip('/') + '/' + projectName remoteName = self.name + if self.remoteAlias: + remoteName = self.remoteAlias return RemoteSpec(remoteName, url, self.reviewUrl) class XmlManifest(object): @@ -145,6 +147,8 @@ class XmlManifest(object): root.appendChild(e) e.setAttribute('name', r.name) e.setAttribute('fetch', r.fetchUrl) + if r.remoteAlias is not None: + e.setAttribute('alias', r.remoteAlias) if r.reviewUrl is not None: e.setAttribute('review', r.reviewUrl) @@ -223,7 +227,8 @@ class XmlManifest(object): e.setAttribute('name', name) if relpath != name: e.setAttribute('path', relpath) - if not d.remote or p.remote.name != d.remote.name: + remoteName = d.remote.remoteAlias or d.remote.name + if not d.remote or p.remote.name != remoteName: e.setAttribute('remote', p.remote.name) if peg_rev: if self.IsMirror: