| 1 |
Author: zmedico |
| 2 |
Date: 2010-01-30 13:42:09 +0000 (Sat, 30 Jan 2010) |
| 3 |
New Revision: 15284 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/portage/__init__.py |
| 7 |
Log: |
| 8 |
For immutable config attributes, use shallow copy for speed and memory |
| 9 |
conservation. |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/trunk/pym/portage/__init__.py |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/pym/portage/__init__.py 2010-01-30 13:06:40 UTC (rev 15283) |
| 15 |
+++ main/trunk/pym/portage/__init__.py 2010-01-30 13:42:09 UTC (rev 15284) |
| 16 |
@@ -1583,10 +1583,13 @@ |
| 17 |
if clone: |
| 18 |
# For immutable attributes, use shallow copy for |
| 19 |
# speed and memory conservation. |
| 20 |
+ self.depcachedir = clone.depcachedir |
| 21 |
self.incrementals = clone.incrementals |
| 22 |
+ self.module_priority = clone.module_priority |
| 23 |
self.profile_path = clone.profile_path |
| 24 |
self.profiles = clone.profiles |
| 25 |
self.packages = clone.packages |
| 26 |
+ self.usemask_list = clone.usemask_list |
| 27 |
|
| 28 |
self.user_profile_dir = copy.deepcopy(clone.user_profile_dir) |
| 29 |
self.local_config = copy.deepcopy(clone.local_config) |
| 30 |
@@ -1594,11 +1597,7 @@ |
| 31 |
copy.deepcopy(clone._local_repo_configs) |
| 32 |
self._local_repo_conf_path = \ |
| 33 |
copy.deepcopy(clone._local_repo_conf_path) |
| 34 |
- |
| 35 |
- self.module_priority = copy.deepcopy(clone.module_priority) |
| 36 |
self.modules = copy.deepcopy(clone.modules) |
| 37 |
- |
| 38 |
- self.depcachedir = copy.deepcopy(clone.depcachedir) |
| 39 |
self.virtuals = copy.deepcopy(clone.virtuals) |
| 40 |
self.dirVirtuals = copy.deepcopy(clone.dirVirtuals) |
| 41 |
self.treeVirtuals = copy.deepcopy(clone.treeVirtuals) |
| 42 |
@@ -1608,7 +1607,6 @@ |
| 43 |
|
| 44 |
self.use_defs = copy.deepcopy(clone.use_defs) |
| 45 |
self.usemask = copy.deepcopy(clone.usemask) |
| 46 |
- self.usemask_list = copy.deepcopy(clone.usemask_list) |
| 47 |
self.pusemask_list = copy.deepcopy(clone.pusemask_list) |
| 48 |
self.useforce = copy.deepcopy(clone.useforce) |
| 49 |
self.useforce_list = copy.deepcopy(clone.useforce_list) |
| 50 |
@@ -1685,7 +1683,7 @@ |
| 51 |
if not isinstance(self.incrementals, tuple): |
| 52 |
self.incrementals = tuple(self.incrementals) |
| 53 |
|
| 54 |
- self.module_priority = ["user","default"] |
| 55 |
+ self.module_priority = ("user", "default") |
| 56 |
self.modules = {} |
| 57 |
modules_loader = portage.env.loaders.KeyValuePairFileLoader( |
| 58 |
os.path.join(config_root, MODULES_FILE_PATH), None, None) |
| 59 |
@@ -1788,8 +1786,9 @@ |
| 60 |
self._pkeywords_list.append(cpdict) |
| 61 |
|
| 62 |
# get profile-masked use flags -- INCREMENTAL Child over parent |
| 63 |
- self.usemask_list = [grabfile(os.path.join(x, "use.mask"), |
| 64 |
- recursive=1) for x in self.profiles] |
| 65 |
+ self.usemask_list = tuple( |
| 66 |
+ tuple(grabfile(os.path.join(x, "use.mask"), recursive=1)) |
| 67 |
+ for x in self.profiles) |
| 68 |
self.usemask = set(stack_lists( |
| 69 |
self.usemask_list, incremental=True)) |
| 70 |
use_defs_lists = [grabdict(os.path.join(x, "use.defaults")) for x in self.profiles] |
Archives