diff options
-rw-r--r-- | pym/portage_manifest.py | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/pym/portage_manifest.py b/pym/portage_manifest.py index cdccbd9fa..ccd32ec67 100644 --- a/pym/portage_manifest.py +++ b/pym/portage_manifest.py @@ -443,11 +443,22 @@ class Manifest(object): self.__init__(self.pkgdir, self.distdir, fetchlist_dict=self.fetchlist_dict, from_scratch=True, manifest1_compat=self.compat) + cpvlist = [] + pn = os.path.basename(self.pkgdir.rstrip(os.path.sep)) + cat = self._pkgdir_category() for pkgdir, pkgdir_dirs, pkgdir_files in os.walk(self.pkgdir): break for f in pkgdir_files: if f.endswith(".ebuild"): mytype = "EBUILD" + pf = f[:-7] + ps = portage_versions.pkgsplit(pf) + cpv = "%s/%s" % (cat, pf) + if not ps: + raise portage_exception.PortagePackageException(cpv) + if ps[0] != pn: + raise portage_exception.PortagePackageException(cpv) + cpvlist.append(cpv) elif manifest2MiscfileFilter(f): mytype = "MISC" else: @@ -464,7 +475,6 @@ class Manifest(object): continue self.fhashdict["AUX"][f] = perform_multiple_checksums( os.path.join(self.pkgdir, "files", f.lstrip(os.sep)), self.hashes) - cpvlist = [os.path.join(self._pkgdir_category(), x[:-7]) for x in os.listdir(self.pkgdir) if x.endswith(".ebuild")] distlist = set() for cpv in cpvlist: distlist.update(self._getCpvDistfiles(cpv)) |