summaryrefslogtreecommitdiffstats
path: root/manifest_xml.py
diff options
context:
space:
mode:
authorDan Willemsen <dwillemsen@google.com>2015-09-09 21:43:32 +0000
committerDan Willemsen <dwillemsen@google.com>2015-09-09 21:43:32 +0000
commit037552333182497e9e38bff984de44df0f93e54b (patch)
tree4833639da39e34dc4388f06b1eccb541d74589db /manifest_xml.py
parent250303b437855c2b50d052a05a08ed517423af8b (diff)
downloadgit-repo-037552333182497e9e38bff984de44df0f93e54b.tar.gz
Revert "GITC: Always update the gitc manifest from the repo manifest"
This reverts commit 250303b437855c2b50d052a05a08ed517423af8b. Change-Id: I1fd8af20f802553151aacb953c913f3305ca6057
Diffstat (limited to 'manifest_xml.py')
-rw-r--r--manifest_xml.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/manifest_xml.py b/manifest_xml.py
index 3ac607ec..a7fe8ddf 100644
--- a/manifest_xml.py
+++ b/manifest_xml.py
@@ -167,13 +167,12 @@ class XmlManifest(object):
167 def _ParseGroups(self, groups): 167 def _ParseGroups(self, groups):
168 return [x for x in re.split(r'[,\s]+', groups) if x] 168 return [x for x in re.split(r'[,\s]+', groups) if x]
169 169
170 def Save(self, fd, peg_rev=False, peg_rev_upstream=True, groups=None): 170 def Save(self, fd, peg_rev=False, peg_rev_upstream=True):
171 """Write the current manifest out to the given file descriptor. 171 """Write the current manifest out to the given file descriptor.
172 """ 172 """
173 mp = self.manifestProject 173 mp = self.manifestProject
174 174
175 if groups is None: 175 groups = mp.config.GetString('manifest.groups')
176 groups = mp.config.GetString('manifest.groups')
177 if groups: 176 if groups:
178 groups = self._ParseGroups(groups) 177 groups = self._ParseGroups(groups)
179 178