diff options
| author | Shawn O. Pearce <sop@google.com> | 2011-11-30 13:41:02 -0800 |
|---|---|---|
| committer | Shawn O. Pearce <sop@google.com> | 2011-11-30 13:41:02 -0800 |
| commit | 34fb20f67c7bdca2b1321a40f2fd558f9a34d866 (patch) | |
| tree | b3f9f06b115d2d52aa01c6deda8a3f3c3af345c2 /manifest_xml.py | |
| parent | ecff4f17b08f791466b73d935c772de57f2257e6 (diff) | |
| download | git-repo-34fb20f67c7bdca2b1321a40f2fd558f9a34d866.tar.gz | |
Revert "Default repo manifest settings in git config"v1.7.8.1
This reverts commit ee1c2f5717fcc137ab887a4aae8a08d50a539b9a.
This breaks a lot of buildbot systems. Rolling it back for now
until we can understand what the breakage was and how to fix it.
Diffstat (limited to 'manifest_xml.py')
| -rw-r--r-- | manifest_xml.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/manifest_xml.py b/manifest_xml.py index c9e5c405..9189eec4 100644 --- a/manifest_xml.py +++ b/manifest_xml.py | |||
| @@ -228,11 +228,7 @@ class XmlManifest(object): | |||
| 228 | @property | 228 | @property |
| 229 | def manifest_server(self): | 229 | def manifest_server(self): |
| 230 | self._Load() | 230 | self._Load() |
| 231 | 231 | return self._manifest_server | |
| 232 | if self._manifest_server: | ||
| 233 | return self._manifest_server | ||
| 234 | |||
| 235 | return self.manifestProject.config.GetString('repo.manifest-server') | ||
| 236 | 232 | ||
| 237 | @property | 233 | @property |
| 238 | def IsMirror(self): | 234 | def IsMirror(self): |