From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 12 May 2007 23:14:19 +0000 (-0000)
Subject: Add TODO note about support for blocks within slots.  Thanks to Brian Harring for... 
X-Git-Tag: v2.2_pre1~1433
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=224879708b3c85952bc6912fce7edcbaf553deb1;p=portage.git

Add TODO note about support for blocks within slots.  Thanks to Brian Harring for reporting.

svn path=/main/trunk/; revision=6524
---

diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py
index 4d3f32e76..e6d2d8236 100644
--- a/pym/emerge/__init__.py
+++ b/pym/emerge/__init__.py
@@ -1915,10 +1915,10 @@ class depgraph:
 				for cpv in blocked_initial:
 					slot_atom = blocked_slots_initial[cpv]
 					if slot_atom == pslot_atom:
-						# The parent blocks an initial package in the same
-						# slot as itself.  The merge/nomerge status of neither
-						# node matters.  In any case, this particular block is
-						# automatically resolved.
+						# TODO: Support blocks within slots in cases where it
+						# might make sense.  For example, a new version might
+						# require that the old version be uninstalled at build
+						# time.
 						continue
 					if parent_static and \
 						slot_atom not in modified_slots[myroot]:
@@ -1942,8 +1942,7 @@ class depgraph:
 				for cpv in blocked_final:
 					slot_atom = blocked_slots_final[cpv]
 					if slot_atom == pslot_atom:
-						# The parent blocks itself, so the merge order does not
-						# need to be enforced.
+						# TODO: Support blocks within slots.
 						continue
 					if parent_static and \
 						slot_atom not in modified_slots[myroot]: