| 1 |
Author: zmedico |
| 2 |
Date: 2010-02-17 03:50:39 +0000 (Wed, 17 Feb 2010) |
| 3 |
New Revision: 15362 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/depgraph.py |
| 7 |
main/trunk/pym/portage/const.py |
| 8 |
Log: |
| 9 |
Bug #303567 - Merge libc asap, in order to account for implicit dependencies. |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/trunk/pym/_emerge/depgraph.py |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/pym/_emerge/depgraph.py 2010-02-16 22:13:32 UTC (rev 15361) |
| 15 |
+++ main/trunk/pym/_emerge/depgraph.py 2010-02-17 03:50:39 UTC (rev 15362) |
| 16 |
@@ -3335,6 +3335,15 @@ |
| 17 |
runtime_deps.update(atom for atom in atoms \ |
| 18 |
if not atom.blocker) |
| 19 |
|
| 20 |
+ # Merge libc asap, in order to account for implicit |
| 21 |
+ # dependencies. See bug #303567. |
| 22 |
+ libc_pkg = self._dynamic_config.mydbapi[running_root].match_pkgs( |
| 23 |
+ portage.const.LIBC_PACKAGE_ATOM) |
| 24 |
+ if libc_pkg: |
| 25 |
+ libc_pkg = libc_pkg[0] |
| 26 |
+ if libc_pkg.operation == 'merge': |
| 27 |
+ asap_nodes.append(libc_pkg) |
| 28 |
+ |
| 29 |
def gather_deps(ignore_priority, mergeable_nodes, |
| 30 |
selected_nodes, node): |
| 31 |
""" |
| 32 |
|
| 33 |
Modified: main/trunk/pym/portage/const.py |
| 34 |
=================================================================== |
| 35 |
--- main/trunk/pym/portage/const.py 2010-02-16 22:13:32 UTC (rev 15361) |
| 36 |
+++ main/trunk/pym/portage/const.py 2010-02-17 03:50:39 UTC (rev 15362) |
| 37 |
@@ -71,6 +71,7 @@ |
| 38 |
REPO_NAME_LOC = "profiles" + "/" + REPO_NAME_FILE |
| 39 |
|
| 40 |
PORTAGE_PACKAGE_ATOM = "sys-apps/portage" |
| 41 |
+LIBC_PACKAGE_ATOM = "virtual/libc" |
| 42 |
|
| 43 |
INCREMENTALS = ("USE", "USE_EXPAND", "USE_EXPAND_HIDDEN", |
| 44 |
"FEATURES", "ACCEPT_KEYWORDS", |
Archives