commit c59bafffb972dedd279e16a3a34415cda2ce3f58
author Conley Owens <cco3@android.com> Thu Jan 17 17:06:49 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 17 17:06:49 2013 +0000
tree fbbb67a02619f1e5cdfd6755343bd53834987a0d
parent 0290cad5db0eef3b15eb976dd7a017837e36c8b7
parent 1a5c774cbff8aead0c45cc90be2f78ffd08dc376

Merge "Pass full path of the XML in local_manifests to the parser"

manifest_xml.py

diff --git a/manifest_xml.py b/manifest_xml.py
index 1300e91..c44b9c5 100644
--- a/manifest_xml.py
+++ b/manifest_xml.py
@@ -345,7 +345,8 @@
         for local_file in sorted(os.listdir(local_dir)):
           if local_file.endswith('.xml'):
             try:
-              nodes.append(self._ParseManifestXml(local_file, self.repodir))
+              local = os.path.join(local_dir, local_file)
+              nodes.append(self._ParseManifestXml(local, self.repodir))
             except ManifestParseError as e:
               print('%s' % str(e), file=sys.stderr)
       except OSError: