| 1 |
Author: zmedico |
| 2 |
Date: 2010-03-02 19:48:43 +0000 (Tue, 02 Mar 2010) |
| 3 |
New Revision: 15524 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.7/pym/portage/__init__.py |
| 7 |
Log: |
| 8 |
For immutable config attributes, use shallow copy for speed and memory |
| 9 |
conservation. (trunk r15285) |
| 10 |
|
| 11 |
Modified: main/branches/2.1.7/pym/portage/__init__.py |
| 12 |
=================================================================== |
| 13 |
--- main/branches/2.1.7/pym/portage/__init__.py 2010-03-02 18:27:34 UTC (rev 15523) |
| 14 |
+++ main/branches/2.1.7/pym/portage/__init__.py 2010-03-02 19:48:43 UTC (rev 15524) |
| 15 |
@@ -1583,12 +1583,14 @@ |
| 16 |
if clone: |
| 17 |
# For immutable attributes, use shallow copy for |
| 18 |
# speed and memory conservation. |
| 19 |
+ self.categories = clone.categories |
| 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.useforce_list = clone.useforce_list |
| 27 |
self.usemask_list = clone.usemask_list |
| 28 |
|
| 29 |
self.user_profile_dir = copy.deepcopy(clone.user_profile_dir) |
| 30 |
@@ -1609,7 +1611,6 @@ |
| 31 |
self.usemask = copy.deepcopy(clone.usemask) |
| 32 |
self.pusemask_list = copy.deepcopy(clone.pusemask_list) |
| 33 |
self.useforce = copy.deepcopy(clone.useforce) |
| 34 |
- self.useforce_list = copy.deepcopy(clone.useforce_list) |
| 35 |
self.puseforce_list = copy.deepcopy(clone.puseforce_list) |
| 36 |
self.puse = copy.deepcopy(clone.puse) |
| 37 |
self.make_defaults_use = copy.deepcopy(clone.make_defaults_use) |
| 38 |
@@ -1633,7 +1634,6 @@ |
| 39 |
self._use_expand_dict = copy.deepcopy(clone._use_expand_dict) |
| 40 |
self.backupenv = self.configdict["backupenv"] |
| 41 |
self.pusedict = copy.deepcopy(clone.pusedict) |
| 42 |
- self.categories = copy.deepcopy(clone.categories) |
| 43 |
self.pkeywordsdict = copy.deepcopy(clone.pkeywordsdict) |
| 44 |
self._pkeywords_list = copy.deepcopy(clone._pkeywords_list) |
| 45 |
self.pmaskdict = copy.deepcopy(clone.pmaskdict) |
| 46 |
@@ -1815,8 +1815,9 @@ |
| 47 |
self.pkgprofileuse.append(cpdict) |
| 48 |
del rawprofileuse |
| 49 |
|
| 50 |
- self.useforce_list = [grabfile(os.path.join(x, "use.force"), |
| 51 |
- recursive=1) for x in self.profiles] |
| 52 |
+ self.useforce_list = tuple( |
| 53 |
+ tuple(grabfile(os.path.join(x, "use.force"), recursive=1)) |
| 54 |
+ for x in self.profiles) |
| 55 |
self.useforce = set(stack_lists( |
| 56 |
self.useforce_list, incremental=True)) |
Archives