View | Details | Raw Unified
Collapse All | Expand All

(-) emerge (-10 / +20 lines)
 Lines 925-941    Link Here  
			merging=2
			merging=2
		if merging==1:
		if merging==1:
			mybigkey.append("merge")
			mybigkey.append("merge")
			self.mydbapi[myroot].cpv_inject(mykey)
 
		else:
		else:
			mybigkey.append("nomerge")
			mybigkey.append("nomerge")
			
			
		# Adjust pkgsettings with any virtuals this package provides.
 
		if merging!=0:
 
			if mytype=="binary":
 
				self.pkgsettings.setinst(mykey,portage.db["/"]["bintree"].dbapi)
 
			elif merging:
 
				self.pkgsettings.setinst(mykey,portage.db[myroot]["porttree"].dbapi)
 

              
            

        
		# whatever the case, we need to add the node to our digraph so
		# whatever the case, we need to add the node to our digraph so

        
		# that children can depend upon it.
		# that children can depend upon it.

        
		self.digraph.addnode(string.join(mybigkey),myparent)
		self.digraph.addnode(string.join(mybigkey),myparent)

  

    

    

       Lines 1118-1129
       
    
  Link Here 
    

  

        
			#mycheck=portage.dep_check(depstring,self.mydbapi[myroot],self.pkgsettings,myuse=myuse)
			#mycheck=portage.dep_check(depstring,self.mydbapi[myroot],self.pkgsettings,myuse=myuse)

        

        
			if not mycheck[0]:
			if not mycheck[0]:

            

              
				return 0

              
				mymerge=[]

            

            

              
			mymerge=mycheck[1]

              
			else:

            

            

              

              
				mymerge=mycheck[1]

            

        

        
		else:
		else:

        
			#we're processing a command-line argument; unconditionally merge it even if it's already merged
			#we're processing a command-line argument; unconditionally merge it even if it's already merged

        
			mymerge=[depstring]
			mymerge=[depstring]

            

              
              
		

            

            

              
              
		# dep_check has been run so we can now add our parent to our

            

            

              
              
		# build state to update virtuals and other settings. This

            

            

              
              
		# happens after the package is added to the tree so that a

            

            

              
              
		# package can depend on a virtual which it satisfies.

            

            

              
              
		if myparent:

            

            

              
              
			myp = myparent.split()

            

            

              
              
			if myp[3]=="merge":

            

            

              
              
				self.mydbapi[myroot].cpv_inject(myp[2])

            

            

              
              
				if myp[0]=="binary":

            

            

              
              
					self.pkgsettings.setinst(myp[2],portage.db["/"]["bintree"].dbapi)

            

            

              
              
				else:

            

            

              
              
					self.pkgsettings.setinst(myp[2],portage.db[myroot]["porttree"].dbapi)

            

            

              
              

            

            

              
              
		if not mymerge:

            

            

              
              
			return 1

            

            

              
              
		

            

        
		if "--debug" in myopts:
		if "--debug" in myopts:

        
			print "Candidates:",mymerge
			print "Candidates:",mymerge

        
		for x in mymerge:
		for x in mymerge: