diff options
author | Dan Willemsen <dwillemsen@google.com> | 2015-09-09 21:44:11 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-09-09 21:44:11 +0000 |
commit | 5cc384034d144c339d2e5822c36c5ca4529ac487 (patch) | |
tree | e2a5cb35a8ea85984c7e4f92bac9fffd4d1e617c /manifest_xml.py | |
parent | c32ba1961e3451101ce94a26f83cf56681ff6414 (diff) | |
parent | 037552333182497e9e38bff984de44df0f93e54b (diff) | |
download | git-repo-5cc384034d144c339d2e5822c36c5ca4529ac487.tar.gz |
Merge "Revert "GITC: Always update the gitc manifest from the repo manifest""v1.12.30.1
Diffstat (limited to 'manifest_xml.py')
-rw-r--r-- | manifest_xml.py | 5 |
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 | ||