| 1 |
Author: zmedico |
| 2 |
Date: 2008-05-02 20:30:01 +0000 (Fri, 02 May 2008) |
| 3 |
New Revision: 10104 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/__init__.py |
| 7 |
Log: |
| 8 |
When searching for a "sys-apps/portage" installation task, use match_pkgs() |
| 9 |
instead of sequential search. |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/trunk/pym/_emerge/__init__.py |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/pym/_emerge/__init__.py 2008-05-02 20:17:04 UTC (rev 10103) |
| 15 |
+++ main/trunk/pym/_emerge/__init__.py 2008-05-02 20:30:01 UTC (rev 10104) |
| 16 |
@@ -3430,7 +3430,7 @@ |
| 17 |
complete = "complete" in self.myparams |
| 18 |
myblocker_parents = self._blocker_parents.copy() |
| 19 |
asap_nodes = [] |
| 20 |
- portage_node = None |
| 21 |
+ |
| 22 |
def get_nodes(**kwargs): |
| 23 |
""" |
| 24 |
Returns leaf nodes excluding Uninstall instances |
| 25 |
@@ -3441,13 +3441,15 @@ |
| 26 |
node.operation != "uninstall"] |
| 27 |
|
| 28 |
# sys-apps/portage needs special treatment if ROOT="/" |
| 29 |
- for node in mygraph.order: |
| 30 |
- if isinstance(node, Package) and \ |
| 31 |
- "sys-apps/portage" == node.cp and \ |
| 32 |
- "/" == node.root: |
| 33 |
- portage_node = node |
| 34 |
- asap_nodes.append(node) |
| 35 |
- break |
| 36 |
+ portage_node = self.mydbapi["/"].match_pkgs("sys-apps/portage") |
| 37 |
+ if portage_node: |
| 38 |
+ portage_node = portage_node[0] |
| 39 |
+ else: |
| 40 |
+ portage_node = None |
| 41 |
+ if portage_node is not None and \ |
| 42 |
+ (not mygraph.contains(portage_node) or \ |
| 43 |
+ portage_node.operation == "nomerge"): |
| 44 |
+ portage_node = None |
| 45 |
|
| 46 |
ignore_priority_soft_range = [None] |
| 47 |
ignore_priority_soft_range.extend( |
| 48 |
|
| 49 |
-- |
| 50 |
gentoo-commits@l.g.o mailing list |
Archives