summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-11-07 10:04:41 +0000
committerZac Medico <zmedico@gentoo.org>2006-11-07 10:04:41 +0000
commitc16e0ea665b887af07ef52c1fa1ec6f94282ee4f (patch)
treed730903a4a7d9ccf240bc029594eb1b8af689442
parent50e65dc97194584c05702611531edab26cf54543 (diff)
downloadportage-c16e0ea665b887af07ef52c1fa1ec6f94282ee4f.tar.gz
portage-c16e0ea665b887af07ef52c1fa1ec6f94282ee4f.tar.bz2
portage-c16e0ea665b887af07ef52c1fa1ec6f94282ee4f.zip
Remove some stray blocker validation logic.
svn path=/main/trunk/; revision=4978
-rwxr-xr-xbin/emerge7
1 files changed, 0 insertions, 7 deletions
diff --git a/bin/emerge b/bin/emerge
index 5fdf72c0f..697e3124f 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -1220,13 +1220,6 @@ class depgraph:
for x in mymerge:
selected_pkg = None
if x[0]=="!":
- # if this package is myself, don't append it to block list.
- if myparent:
- mydep = x[1:]
- if mydep == portage.dep_getkey(mydep) and \
- mydep == portage.dep_getkey(myparent.split()[2]):
- continue
- # adding block
selected_pkg = ["blocks", myroot, x[1:], None]
else:
#We are not processing a blocker but a normal dependency