diff options
| -rw-r--r-- | manifest_xml.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/manifest_xml.py b/manifest_xml.py index 84be8f4a..ea274c76 100644 --- a/manifest_xml.py +++ b/manifest_xml.py | |||
| @@ -358,7 +358,10 @@ class XmlManifest(object): | |||
| 358 | 358 | ||
| 359 | self.repodir = os.path.abspath(repodir) | 359 | self.repodir = os.path.abspath(repodir) |
| 360 | self._CheckLocalPath(submanifest_path) | 360 | self._CheckLocalPath(submanifest_path) |
| 361 | self.topdir = os.path.join(os.path.dirname(self.repodir), submanifest_path) | 361 | self.topdir = os.path.dirname(self.repodir) |
| 362 | if submanifest_path: | ||
| 363 | # This avoids a trailing os.path.sep when submanifest_path is empty. | ||
| 364 | self.topdir = os.path.join(self.topdir, submanifest_path) | ||
| 362 | if manifest_file != os.path.abspath(manifest_file): | 365 | if manifest_file != os.path.abspath(manifest_file): |
| 363 | raise ManifestParseError('manifest_file must be abspath') | 366 | raise ManifestParseError('manifest_file must be abspath') |
| 364 | self.manifestFile = manifest_file | 367 | self.manifestFile = manifest_file |