diff options
| author | Sebastian Luther <SebastianLuther@gmx.de> | 2010-08-29 11:48:06 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-08-29 11:48:06 -0700 |
| commit | 8af57e645c0840a74cbb6a20cab703cfa6d04baa (patch) | |
| tree | ad83201a6a6f0c8a5d83d55f2fa188d015d55473 /pym/portage/package/ebuild/_config/LocationsManager.py | |
| parent | 434d6fcc99edf04af746d4f0e7173b6ea1fcc0cc (diff) | |
| download | portage-8af57e645c0840a74cbb6a20cab703cfa6d04baa.tar.gz portage-8af57e645c0840a74cbb6a20cab703cfa6d04baa.tar.bz2 portage-8af57e645c0840a74cbb6a20cab703cfa6d04baa.zip | |
Add LocationsManager.profile_and_user_locations for use with config.categories and archlist.
Diffstat (limited to 'pym/portage/package/ebuild/_config/LocationsManager.py')
| -rw-r--r-- | pym/portage/package/ebuild/_config/LocationsManager.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/pym/portage/package/ebuild/_config/LocationsManager.py b/pym/portage/package/ebuild/_config/LocationsManager.py index 2ac2e7492..88f500bd3 100644 --- a/pym/portage/package/ebuild/_config/LocationsManager.py +++ b/pym/portage/package/ebuild/_config/LocationsManager.py @@ -24,6 +24,7 @@ class LocationsManager(object): self.eprefix = eprefix self.config_root = config_root self.target_root = target_root + self._user_config = local_config if self.eprefix is None: self.eprefix = "" @@ -64,7 +65,7 @@ class LocationsManager(object): writemsg("!!! ParseError: %s\n" % str(e), noiselevel=-1) self.profiles = [] - if local_config and self.profiles: + if self._user_config and self.profiles: custom_prof = os.path.join( self.config_root, CUSTOM_PROFILE_PATH) if os.path.exists(custom_prof): @@ -169,7 +170,12 @@ class LocationsManager(object): self.overlay_profiles.append(profiles_dir) self.profile_locations = [os.path.join(portdir, "profiles")] + self.overlay_profiles + self.profile_and_user_locations = self.profile_locations[:] + if self._user_config: + self.profile_and_user_locations.append(self.abs_user_config) + self.profile_locations = tuple(self.profile_locations) + self.profile_and_user_locations = tuple(self.profile_and_user_locations) self.pmask_locations = [os.path.join(portdir, "profiles")] self.pmask_locations.extend(self.profiles) |