View | Details | Raw Unified
Collapse All | Expand All

(-) a/bin/emerge (-1 / +7 lines)
 Lines 1077-1082   class depgraph: Link Here  
				selected_pkg = ["blocks", myroot, x[1:], None]
				selected_pkg = ["blocks", myroot, x[1:], None]
			else:
			else:
				#We are not processing a blocker but a normal dependency
				#We are not processing a blocker but a normal dependency
				pkg_key = portage.dep_getkey(x)
 
				if pkg_key in pkgsettings.pprovideddict and \
 
					portage.match_from_list(
 
						x, pkgsettings.pprovideddict[pkg_key]):
 
						continue
 

            

        
				# List of acceptable packages, ordered by type preference.
				# List of acceptable packages, ordered by type preference.

        
				matched_packages = []
				matched_packages = []

        
				myeb_matches = portdb.xmatch("match-visible", x)
				myeb_matches = portdb.xmatch("match-visible", x)

  

    

    

       Lines 1207-1213
      class depgraph: 
    
  Link Here 
    

  

        
		while (not mygraph.empty()):
		while (not mygraph.empty()):

        
			mycurkey=mygraph.firstzero()
			mycurkey=mygraph.firstzero()

        
			if not mycurkey:
			if not mycurkey:

            

              
				installables = mygraph.leaf_nodes(include_soft_deps=True)

              
				installables = mygraph.leaf_nodes(include_soft_deps=False)

            

        
				if not installables:
				if not installables:

        
					print "!!! Error: circular dependencies:"
					print "!!! Error: circular dependencies:"

        
					print
					print