android/git-repo
1
Fork 0
mirror of https://gerrit.googlesource.com/git-repo synced 2024-12-21 07:16:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

manifest_xml: improve topdir accuracy.

Browse Source 
Do not include a trailing path separator when submanifest_path is empty.

Bug: https://crbug.com/gerrit/16104
Change-Id: Ia65e355de25bdb1067fe50ab1d47db6e798d5a71
Reviewed-on: https://gerrit-review.googlesource.com/c/git-repo/+/343674
Tested-by: LaMont Jones <lamontjones@google.com>
Reviewed-by: Mike Frysinger <vapier@google.com>
This commit is contained in:
LaMont Jones 2022-08-22 19:26:14 +00:00
parent 3d27c71dd9
commit fbd5dd3a30
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
manifest_xml.py
View File

@ -358,7 +358,10 @@ class XmlManifest(object):
self.repodir = os.path.abspath(repodir) self.repodir = os.path.abspath(repodir)
self._CheckLocalPath(submanifest_path) self._CheckLocalPath(submanifest_path)
self.topdir = os.path.join(os.path.dirname(self.repodir), submanifest_path) self.topdir = os.path.dirname(self.repodir)
if submanifest_path:
# This avoids a trailing os.path.sep when submanifest_path is empty.
self.topdir = os.path.join(self.topdir, submanifest_path)
if manifest_file != os.path.abspath(manifest_file): if manifest_file != os.path.abspath(manifest_file):
raise ManifestParseError('manifest_file must be abspath') raise ManifestParseError('manifest_file must be abspath')
self.manifestFile = manifest_file self.manifestFile = manifest_file