diff options
| author | Shawn Pearce <sop@google.com> | 2013-01-28 16:25:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-01-28 16:25:55 +0000 |
| commit | 4baf87f92c55d3daba1410f04bd10f1a41a088b8 (patch) | |
| tree | cac6a39c2bacd11e83938b642303a85048521726 | |
| parent | 84f7e137c20b7500a6a5c719c39e9166c6e40e85 (diff) | |
| parent | 223bf963f0342f3cc50728b2f9535b528592e64a (diff) | |
| download | git-repo-4baf87f92c55d3daba1410f04bd10f1a41a088b8.tar.gz | |
Merge "should use os.path.lexist instead of os.path.exist"
| -rw-r--r-- | manifest_xml.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/manifest_xml.py b/manifest_xml.py index 030da180..53f33537 100644 --- a/manifest_xml.py +++ b/manifest_xml.py | |||
| @@ -126,11 +126,11 @@ class XmlManifest(object): | |||
| 126 | self.Override(name) | 126 | self.Override(name) |
| 127 | 127 | ||
| 128 | try: | 128 | try: |
| 129 | if os.path.exists(self.manifestFile): | 129 | if os.path.lexists(self.manifestFile): |
| 130 | os.remove(self.manifestFile) | 130 | os.remove(self.manifestFile) |
| 131 | os.symlink('manifests/%s' % name, self.manifestFile) | 131 | os.symlink('manifests/%s' % name, self.manifestFile) |
| 132 | except OSError: | 132 | except OSError as e: |
| 133 | raise ManifestParseError('cannot link manifest %s' % name) | 133 | raise ManifestParseError('cannot link manifest %s: %s' % (name, str(e))) |
| 134 | 134 | ||
| 135 | def _RemoteToXml(self, r, doc, root): | 135 | def _RemoteToXml(self, r, doc, root): |
| 136 | e = doc.createElement('remote') | 136 | e = doc.createElement('remote') |