1 |
Author: zmedico |
2 |
Date: 2009-01-10 07:24:46 +0000 (Sat, 10 Jan 2009) |
3 |
New Revision: 12409 |
4 |
|
5 |
Modified: |
6 |
main/trunk/man/portage.5 |
7 |
main/trunk/pym/portage/__init__.py |
8 |
Log: |
9 |
* Enable the recursive option in profile package.use parsing. |
10 |
* Enable package.umask in all the same locations as package.mask. |
11 |
|
12 |
|
13 |
Modified: main/trunk/man/portage.5 |
14 |
=================================================================== |
15 |
--- main/trunk/man/portage.5 2009-01-10 06:24:52 UTC (rev 12408) |
16 |
+++ main/trunk/man/portage.5 2009-01-10 07:24:46 UTC (rev 12409) |
17 |
@@ -31,6 +31,7 @@ |
18 |
packages.build |
19 |
package.mask |
20 |
package.provided |
21 |
+package.unmask |
22 |
package.use |
23 |
package.use.force |
24 |
package.use.mask |
25 |
|
26 |
Modified: main/trunk/pym/portage/__init__.py |
27 |
=================================================================== |
28 |
--- main/trunk/pym/portage/__init__.py 2009-01-10 06:24:52 UTC (rev 12408) |
29 |
+++ main/trunk/pym/portage/__init__.py 2009-01-10 07:24:46 UTC (rev 12409) |
30 |
@@ -1282,9 +1282,8 @@ |
31 |
del rawpusemask |
32 |
|
33 |
self.pkgprofileuse = [] |
34 |
- rawprofileuse = [grabdict_package( |
35 |
- os.path.join(x, "package.use"), juststrings=True) \ |
36 |
- for x in self.profiles] |
37 |
+ rawprofileuse = [grabdict_package(os.path.join(x, "package.use"), |
38 |
+ juststrings=True, recursive=1) for x in self.profiles] |
39 |
for i in xrange(len(self.profiles)): |
40 |
cpdict = {} |
41 |
for k, v in rawprofileuse[i].iteritems(): |
42 |
@@ -1516,17 +1515,6 @@ |
43 |
self._plicensedict[cp] = cp_dict |
44 |
cp_dict[k] = self.expandLicenseTokens(v) |
45 |
|
46 |
- #package.unmask |
47 |
- pkgunmasklines = grabfile_package( |
48 |
- os.path.join(abs_user_config, "package.unmask"), |
49 |
- recursive=1) |
50 |
- for x in pkgunmasklines: |
51 |
- mycatpkg=dep_getkey(x) |
52 |
- if mycatpkg in self.punmaskdict: |
53 |
- self.punmaskdict[mycatpkg].append(x) |
54 |
- else: |
55 |
- self.punmaskdict[mycatpkg]=[x] |
56 |
- |
57 |
#getting categories from an external file now |
58 |
categories = [grabfile(os.path.join(x, "categories")) for x in locations] |
59 |
self.categories = stack_lists(categories, incremental=1) |
60 |
@@ -1536,12 +1524,16 @@ |
61 |
archlist = stack_lists(archlist, incremental=1) |
62 |
self.configdict["conf"]["PORTAGE_ARCHLIST"] = " ".join(archlist) |
63 |
|
64 |
- #package.mask |
65 |
+ # package.mask and package.unmask |
66 |
pkgmasklines = [] |
67 |
+ pkgunmasklines = [] |
68 |
for x in pmask_locations: |
69 |
pkgmasklines.append(grabfile_package( |
70 |
os.path.join(x, "package.mask"), recursive=1)) |
71 |
+ pkgunmasklines.append(grabfile_package( |
72 |
+ os.path.join(x, "package.unmask"), recursive=1)) |
73 |
pkgmasklines = stack_lists(pkgmasklines, incremental=1) |
74 |
+ pkgunmasklines = stack_lists(pkgunmasklines, incremental=1) |
75 |
|
76 |
self.pmaskdict = {} |
77 |
for x in pkgmasklines: |
78 |
@@ -1551,6 +1543,13 @@ |
79 |
else: |
80 |
self.pmaskdict[mycatpkg]=[x] |
81 |
|
82 |
+ for x in pkgunmasklines: |
83 |
+ mycatpkg=dep_getkey(x) |
84 |
+ if mycatpkg in self.punmaskdict: |
85 |
+ self.punmaskdict[mycatpkg].append(x) |
86 |
+ else: |
87 |
+ self.punmaskdict[mycatpkg]=[x] |
88 |
+ |
89 |
pkgprovidedlines = [grabfile(os.path.join(x, "package.provided")) for x in self.profiles] |
90 |
pkgprovidedlines = stack_lists(pkgprovidedlines, incremental=1) |
91 |
has_invalid_data = False |