* [gentoo-commits] portage r10469 - main/branches/2.1.2/bin
@ 2008-05-28 22:16 Zac Medico (zmedico)
0 siblings, 0 replies; only message in thread
From: Zac Medico (zmedico) @ 2008-05-28 22:16 UTC (permalink / raw
To: gentoo-commits
Author: zmedico
Date: 2008-05-28 22:16:22 +0000 (Wed, 28 May 2008)
New Revision: 10469
Modified:
main/branches/2.1.2/bin/emerge
Log:
* Update the fix from bug #220341 to protect USE deps from being neglected.
* Skip redundant Atom construction in select_package().
(trunk r10466:10468)
Modified: main/branches/2.1.2/bin/emerge
===================================================================
--- main/branches/2.1.2/bin/emerge 2008-05-28 22:12:18 UTC (rev 10468)
+++ main/branches/2.1.2/bin/emerge 2008-05-28 22:16:22 UTC (rev 10469)
@@ -3102,7 +3102,8 @@
# List of acceptable packages, ordered by type preference.
matched_packages = []
highest_version = None
- atom = portage_dep.Atom(atom)
+ if not isinstance(atom, portage_dep.Atom):
+ atom = portage_dep.Atom(atom)
atom_cp = atom.cp
existing_node = None
myeb = None
@@ -3145,12 +3146,19 @@
# the newly built package still won't have the expected slot.
# Therefore, assume that such SLOT dependencies are already
# satisfied rather than forcing a rebuild.
- if installed and not cpv_list and matched_packages \
- and portage_dep.dep_getslot(atom):
+ if installed and not cpv_list and \
+ matched_packages and atom.slot:
for pkg in matched_packages:
- if vardb.cpv_exists(pkg.cpv):
+ if not vardb.cpv_exists(pkg.cpv):
+ continue
+ # Remove the slot from the atom and verify that
+ # the package matches the resulting atom.
+ atom_without_slot = portage_dep.remove_slot(atom)
+ atom_without_slot = portage_dep.Atom(atom_without_slot)
+ if portage.match_from_list(
+ atom_without_slot, [pkg]):
cpv_list = [pkg.cpv]
- break
+ break
if not cpv_list:
continue
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2008-05-28 22:16 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-05-28 22:16 [gentoo-commits] portage r10469 - main/branches/2.1.2/bin Zac Medico (zmedico)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox