Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r15285 - main/trunk/pym/portage
Date: Sat, 30 Jan 2010 13:48:53
Message-Id: E1NbDgv-0000qH-3Q@stork.gentoo.org
1 Author: zmedico
2 Date: 2010-01-30 13:48:48 +0000 (Sat, 30 Jan 2010)
3 New Revision: 15285
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:42:09 UTC (rev 15284)
15 +++ main/trunk/pym/portage/__init__.py 2010-01-30 13:48:48 UTC (rev 15285)
16 @@ -1583,12 +1583,14 @@
17 if clone:
18 # For immutable attributes, use shallow copy for
19 # speed and memory conservation.
20 + self.categories = clone.categories
21 self.depcachedir = clone.depcachedir
22 self.incrementals = clone.incrementals
23 self.module_priority = clone.module_priority
24 self.profile_path = clone.profile_path
25 self.profiles = clone.profiles
26 self.packages = clone.packages
27 + self.useforce_list = clone.useforce_list
28 self.usemask_list = clone.usemask_list
29
30 self.user_profile_dir = copy.deepcopy(clone.user_profile_dir)
31 @@ -1609,7 +1611,6 @@
32 self.usemask = copy.deepcopy(clone.usemask)
33 self.pusemask_list = copy.deepcopy(clone.pusemask_list)
34 self.useforce = copy.deepcopy(clone.useforce)
35 - self.useforce_list = copy.deepcopy(clone.useforce_list)
36 self.puseforce_list = copy.deepcopy(clone.puseforce_list)
37 self.puse = copy.deepcopy(clone.puse)
38 self.make_defaults_use = copy.deepcopy(clone.make_defaults_use)
39 @@ -1633,7 +1634,6 @@
40 self._use_expand_dict = copy.deepcopy(clone._use_expand_dict)
41 self.backupenv = self.configdict["backupenv"]
42 self.pusedict = copy.deepcopy(clone.pusedict)
43 - self.categories = copy.deepcopy(clone.categories)
44 self.pkeywordsdict = copy.deepcopy(clone.pkeywordsdict)
45 self._pkeywords_list = copy.deepcopy(clone._pkeywords_list)
46 self.pmaskdict = copy.deepcopy(clone.pmaskdict)
47 @@ -1815,8 +1815,9 @@
48 self.pkgprofileuse.append(cpdict)
49 del rawprofileuse
50
51 - self.useforce_list = [grabfile(os.path.join(x, "use.force"),
52 - recursive=1) for x in self.profiles]
53 + self.useforce_list = tuple(
54 + tuple(grabfile(os.path.join(x, "use.force"), recursive=1))
55 + for x in self.profiles)
56 self.useforce = set(stack_lists(
57 self.useforce_list, incremental=True))