diff options
| author |   Tim Harder <radhermit@gmail.com> | 2016-06-12 00:24:09 -0400 |
|---|---|---|
| committer | Tim Harder <radhermit@gmail.com> | 2016-06-12 00:24:09 -0400 |
| commit | fdf891b14fb411844f945cfb589e8a1c3c53d169 (patch) | |
| tree | ce462bd7c058cfb627ff87839a3798e5646344d0 | |
| parent | ebuild/repository: don't reparse master mirrors (diff) | |
| download | pkgcore-fdf891b14fb411844f945cfb589e8a1c3c53d169.tar.gz pkgcore-fdf891b14fb411844f945cfb589e8a1c3c53d169.tar.bz2 pkgcore-fdf891b14fb411844f945cfb589e8a1c3c53d169.zip | |
ebuild/repository: respect local licenses for repos with masters
| -rw-r--r-- | pkgcore/ebuild/repository.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgcore/ebuild/repository.py b/pkgcore/ebuild/repository.py index 893dee93..6a756324 100644 --- a/pkgcore/ebuild/repository.py +++ b/pkgcore/ebuild/repository.py @@ -273,7 +273,10 @@ class _UnconfiguredTree(prototype.tree): "lstat failed on base %s" % (self.base,))) self.eclass_cache = eclass_cache - self.licenses = repo_objs.OverlayedLicenses(*[self] + list(masters)) + self._trees = tuple(masters) + (self,) + self.licenses = repo_objs.Licenses(self.location) + if masters: + self.licenses = repo_objs.OverlayedLicenses(*self._trees) mirrors = {} fp = pjoin(self.location, metadata_offset, "thirdpartymirrors") @@ -297,7 +300,6 @@ class _UnconfiguredTree(prototype.tree): else: cache = (cache,) - self.masters = masters self.mirrors = mirrors self.default_mirrors = default_mirrors self.cache = cache @@ -382,7 +384,7 @@ class _UnconfiguredTree(prototype.tree): # raise KeyError return () categories = set() - for repo in list(self.masters) + [self]: + for repo in self._trees: if repo.hardcoded_categories is not None: categories.update(repo.hardcoded_categories) if categories: |