summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Droste <tdroste@gmx.de>2013-01-03 18:27:45 +0100
committerTobias Droste <tdroste87@gmail.com>2013-01-07 07:46:18 +0100
commit1a5c774cbff8aead0c45cc90be2f78ffd08dc376 (patch)
tree55a53179bc72e305749f891abe8ab3c93c7295b4
parenta9f11b3cb281270084526a490dc61625b51b8192 (diff)
downloadgit-repo-1a5c774cbff8aead0c45cc90be2f78ffd08dc376.tar.gz
Pass full path of the XML in local_manifests to the parser
This fixes the following python error message if the current working directory is not .repo/local_manifests: IOError: [Errno 2] No such file or directory: 'local_manifest.xml' Signed-off-by: Tobias Droste <tdroste87@gmail.com> CC: David Pursehouse <david.pursehouse@sonymobile.com> Change-Id: I4668dc04219b6233c7ff6ca3b4138bec9ee3529f
-rw-r--r--manifest_xml.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/manifest_xml.py b/manifest_xml.py
index 0664eff9..ed521992 100644
--- a/manifest_xml.py
+++ b/manifest_xml.py
@@ -346,7 +346,8 @@ class XmlManifest(object):
346 for local_file in sorted(os.listdir(local_dir)): 346 for local_file in sorted(os.listdir(local_dir)):
347 if local_file.endswith('.xml'): 347 if local_file.endswith('.xml'):
348 try: 348 try:
349 nodes.append(self._ParseManifestXml(local_file, self.repodir)) 349 local = os.path.join(local_dir, local_file)
350 nodes.append(self._ParseManifestXml(local, self.repodir))
350 except ManifestParseError as e: 351 except ManifestParseError as e:
351 print('%s' % str(e), file=sys.stderr) 352 print('%s' % str(e), file=sys.stderr)
352 except OSError: 353 except OSError: