| 1 |
commit: 46c50903c00123a4e30b9032fe9ffc345c811570 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Oct 28 22:06:50 2011 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Oct 28 22:06:50 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=46c50903 |
| 7 |
|
| 8 |
config: discard profiles_complex attribute |
| 9 |
|
| 10 |
Like LocationsManager, it's only used in the constructor, so there's |
| 11 |
no need to hold a reference after the constructor completes. |
| 12 |
|
| 13 |
--- |
| 14 |
pym/portage/package/ebuild/config.py | 11 +++++------ |
| 15 |
1 files changed, 5 insertions(+), 6 deletions(-) |
| 16 |
|
| 17 |
diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py |
| 18 |
index 1ad1ad7..765a4f7 100644 |
| 19 |
--- a/pym/portage/package/ebuild/config.py |
| 20 |
+++ b/pym/portage/package/ebuild/config.py |
| 21 |
@@ -210,7 +210,6 @@ class config(object): |
| 22 |
self.module_priority = clone.module_priority |
| 23 |
self.profile_path = clone.profile_path |
| 24 |
self.profiles = clone.profiles |
| 25 |
- self.profiles_complex = clone.profiles_complex |
| 26 |
self.packages = clone.packages |
| 27 |
self.repositories = clone.repositories |
| 28 |
self._iuse_implicit_match = clone._iuse_implicit_match |
| 29 |
@@ -408,8 +407,8 @@ class config(object): |
| 30 |
|
| 31 |
locations_manager.load_profiles(known_repos) |
| 32 |
|
| 33 |
+ profiles_complex = locations_manager.profiles_complex |
| 34 |
self.profiles = locations_manager.profiles |
| 35 |
- self.profiles_complex = locations_manager.profiles_complex |
| 36 |
self.profile_path = locations_manager.profile_path |
| 37 |
self.user_profile_dir = locations_manager.user_profile_dir |
| 38 |
|
| 39 |
@@ -556,11 +555,11 @@ class config(object): |
| 40 |
self._repo_make_defaults[repo.name] = d |
| 41 |
|
| 42 |
#Read package.keywords and package.accept_keywords. |
| 43 |
- self._keywords_manager = KeywordsManager(self.profiles_complex, abs_user_config, \ |
| 44 |
+ self._keywords_manager = KeywordsManager(profiles_complex, abs_user_config, \ |
| 45 |
local_config, global_accept_keywords=self.configdict["defaults"].get("ACCEPT_KEYWORDS", "")) |
| 46 |
|
| 47 |
#Read all USE related files from profiles and optionally from user config. |
| 48 |
- self._use_manager = UseManager(self.repositories, self.profiles_complex, abs_user_config, user_config=local_config) |
| 49 |
+ self._use_manager = UseManager(self.repositories, profiles_complex, abs_user_config, user_config=local_config) |
| 50 |
#Initialize all USE related variables we track ourselves. |
| 51 |
self.usemask = self._use_manager.getUseMask() |
| 52 |
self.useforce = self._use_manager.getUseForce() |
| 53 |
@@ -577,7 +576,7 @@ class config(object): |
| 54 |
self.configdict["conf"].get("ACCEPT_LICENSE", "")) |
| 55 |
|
| 56 |
#Read package.mask and package.unmask from profiles and optionally from user config |
| 57 |
- self._mask_manager = MaskManager(self.repositories, self.profiles_complex, |
| 58 |
+ self._mask_manager = MaskManager(self.repositories, profiles_complex, |
| 59 |
abs_user_config, user_config=local_config, |
| 60 |
strict_umatched_removal=_unmatched_removal) |
| 61 |
|
| 62 |
@@ -639,7 +638,7 @@ class config(object): |
| 63 |
pkgprovidedlines = [grabfile( |
| 64 |
os.path.join(x.location, "package.provided"), |
| 65 |
recursive=x.portage1_directories) |
| 66 |
- for x in self.profiles_complex] |
| 67 |
+ for x in profiles_complex] |
| 68 |
pkgprovidedlines = stack_lists(pkgprovidedlines, incremental=1) |
| 69 |
has_invalid_data = False |
| 70 |
for x in range(len(pkgprovidedlines)-1, -1, -1): |
Archives