diff options
| author | Conley Owens <cco3@android.com> | 2013-01-17 17:06:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-01-17 17:06:49 +0000 |
| commit | c59bafffb972dedd279e16a3a34415cda2ce3f58 (patch) | |
| tree | fbbb67a02619f1e5cdfd6755343bd53834987a0d | |
| parent | 0290cad5db0eef3b15eb976dd7a017837e36c8b7 (diff) | |
| parent | 1a5c774cbff8aead0c45cc90be2f78ffd08dc376 (diff) | |
| download | git-repo-c59bafffb972dedd279e16a3a34415cda2ce3f58.tar.gz | |
Merge "Pass full path of the XML in local_manifests to the parser"
| -rw-r--r-- | manifest_xml.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/manifest_xml.py b/manifest_xml.py index 1300e916..c44b9c5e 100644 --- a/manifest_xml.py +++ b/manifest_xml.py | |||
| @@ -345,7 +345,8 @@ class XmlManifest(object): | |||
| 345 | for local_file in sorted(os.listdir(local_dir)): | 345 | for local_file in sorted(os.listdir(local_dir)): |
| 346 | if local_file.endswith('.xml'): | 346 | if local_file.endswith('.xml'): |
| 347 | try: | 347 | try: |
| 348 | nodes.append(self._ParseManifestXml(local_file, self.repodir)) | 348 | local = os.path.join(local_dir, local_file) |
| 349 | nodes.append(self._ParseManifestXml(local, self.repodir)) | ||
| 349 | except ManifestParseError as e: | 350 | except ManifestParseError as e: |
| 350 | print('%s' % str(e), file=sys.stderr) | 351 | print('%s' % str(e), file=sys.stderr) |
| 351 | except OSError: | 352 | except OSError: |
