Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 336085 | Differences between
and this patch

Collapse All | Expand All

(-)a/pym/_emerge/resolver/slot_collision.py (-2 / +6 lines)
Lines 327-333 class slot_conflict_handler(object): Link Here
327 
										if ppkg == x[0] and atom == x[1]:
 327 
										if ppkg == x[0] and atom == x[1]:
328 
											version_violated = True
 328 
											version_violated = True
329 
								elif type == "use":
 329 
								elif type == "use":
330 
									use.append(sub_type)
 330 
									for x in collision_reasons[(type, sub_type)]:
331 
										# TODO: Review this conditional for
332 
										# validity (see bug #336085).
333 
										if ppkg == x[0] and atom == x[1]:
334 
											use.append(sub_type)
335 
											break
331 

          336
          

        

        

          332
          
							atom_str = highlight_violations(atom.unevaluated_atom, version_violated, use)

          337
          
							atom_str = highlight_violations(atom.unevaluated_atom, version_violated, use)

        

        

          333
          

          338
          

        

            

              334
              
- 

              
              
            






  

  Return to bug 336085