[patch] updated fix against 20040826

portage_fix.diff (text/plain), 14.38 KB, created by Michael Stewart (vericgar) (RETIRED) on 2004-08-31 22:57:29 UTC

diff -ur portage.orig.20040826/pym/portage.py portage/pym/portage.py
--- portage.orig.20040826/pym/portage.py	2004-08-26 02:16:14.000000000 -0700
+++ portage/pym/portage.py	2004-08-31 22:33:33.000000000 -0700
@@ -833,7 +833,7 @@
 	return newdict
 
 def grabdict_package(myfilename,juststrings=0):
-	pkgs=grabdict(myfilename, juststrings, empty=1)
+	pkgs=grabdict(myfilename, juststrings=juststrings, empty=1)
 	for x in pkgs.keys():
 		if not isvalidatom(x):
 			del(pkgs[x])
@@ -927,7 +927,7 @@
 				raise Exception("ParseError: Unexpected EOF: "+str(mycfg)+": line "+str(lex.lineno))
 			else:
 				return mykeys
-		mykeys[key]=varexpand(val,mykeys)
+		mykeys[key]=varexpand(val,mydict=mykeys)
 	return mykeys
 
 #cache expansions of constant strings
@@ -1520,7 +1520,7 @@
 			myuse = self["USE"]
 		else:
 			myuse = mydbapi.aux_get(mycpv, ["USE"])[0]
-		virts = portage_dep.use_reduce(portage_dep.paren_reduce(provides), myuse.split())
+		virts = portage_dep.use_reduce(portage_dep.paren_reduce(provides), uselist=myuse.split())
 
 		cp = dep_getkey(mycpv)
 		for virt in virts:
@@ -2445,7 +2445,7 @@
 				print x
 			return 0
 
-		if not digestCheckFiles(mymfiles, mymdigests, pbasedir, "files  ", strict):
+		if not digestCheckFiles(mymfiles, mymdigests, pbasedir, note="files  ", strict=strict):
 			if strict:
 				print ">>> Please ensure you have sync'd properly. Please try '"+bold("emerge sync")+"' and"
 				print ">>> optionally examine the file(s) for corruption. "+bold("A sync will fix most cases.")
@@ -2456,7 +2456,7 @@
 				print
 	
 	# Just return the status, as it's the last check.
-	return digestCheckFiles(myfiles, mydigests, basedir, "src_uri", strict)
+	return digestCheckFiles(myfiles, mydigests, basedir, note="src_uri", strict=strict)
 
 # parse actionmap to spawn ebuild with the appropriate args
 def spawnebuild(mydo,actionmap,mysettings,debug,alwaysdep=0,logfile=None):
@@ -2495,7 +2495,7 @@
 	mypv        = os.path.basename(ebuild_path)[:-7]
 	mycpv       = cat+"/"+mypv
 
-	mysplit=pkgsplit(mypv,0)
+	mysplit=pkgsplit(mypv,silent=0)
 	if mysplit==None:
 		writemsg("!!! Error: PF is null '%s'; exiting.\n" % mypv)
 		return 1
@@ -2780,7 +2780,7 @@
 	except:
 		pass
 
-	if not fetch(fetchme, mysettings, listonly, fetchonly):
+	if not fetch(fetchme, mysettings, listonly=listonly, fetchonly=fetchonly):
 		return 1
 
 	if mydo=="fetch" and listonly:
@@ -3188,7 +3188,7 @@
 			pkgcache[mypkg]=None
 			return None
 
-	elif ververify(myparts[-1],silent):
+	elif ververify(myparts[-1],silent=silent):
 		if len(myparts)==1:
 			if not silent:
 				print "!!! Name error in",mypkg+": missing name part."
@@ -3225,10 +3225,10 @@
 	p_split=None
 	if len(mysplit)==1:
 		retval=["null"]
-		p_split=pkgsplit(mydata,silent)
+		p_split=pkgsplit(mydata,silent=silent)
 	elif len(mysplit)==2:
 		retval=[mysplit[0]]
-		p_split=pkgsplit(mysplit[1],silent)
+		p_split=pkgsplit(mysplit[1],silent=silent)
 	if not p_split:
 		catcache[mydata]=None
 		return None
@@ -3340,7 +3340,7 @@
 					break
 				elif mysplit[mypos]=="(":
 					#recurse
-					mysplit=dep_parenreduce(mysplit,mypos)
+					mysplit=dep_parenreduce(mysplit,mypos=mypos)
 				mypos=mypos+1
 		mypos=mypos+1
 	return mysplit
@@ -3755,7 +3755,7 @@
 	elif mydep[:1] in "=<>~!":
 		prefix=mydep[:1]
 		mydep=mydep[1:]
-	return prefix+cpv_expand(mydep,mydb,use_cache=use_cache)+postfix
+	return prefix+cpv_expand(mydep,mydb=mydb,use_cache=use_cache)+postfix
 
 def dep_check(depstring,mydbapi,mysettings,use="yes",mode=None,myuse=None,use_cache=1,use_binaries=0):
 	"""Takes a depend string and parses the condition."""
@@ -3796,9 +3796,9 @@
 
 		while mysettings["ARCH"] in mymasks:
 			del mymasks[mymasks.index(mysettings["ARCH"])]
-		mysplit = portage_dep.use_reduce(mysplit,myusesplit,masklist=mymasks,matchall=(use=="all"),excludeall=[mysettings["ARCH"]])
+		mysplit = portage_dep.use_reduce(mysplit,uselist=myusesplit,masklist=mymasks,matchall=(use=="all"),excludeall=[mysettings["ARCH"]])
 	else:
-		mysplit = portage_dep.use_reduce(mysplit,myusesplit,matchall=(use=="all"))
+		mysplit = portage_dep.use_reduce(mysplit,uselist=myusesplit,matchall=(use=="all"))
 	
 	# Do the || conversions
 	mysplit=portage_dep.dep_opconvert(mysplit)
@@ -3954,7 +3954,7 @@
 	pkgdict = settings.pkeywordsdict
 
 	for mykey in pkgdict:
-		if portdb.xmatch("bestmatch-list", mykey, None, None, [mycpv]):
+		if portdb.xmatch("bestmatch-list", mykey, mylist=[mycpv]):
 			pgroups.extend(pkgdict[mykey])
 
 	kmask = "missing"
@@ -4014,7 +4014,7 @@
 			self.dbapi=None
 		
 	def resolve_key(self,mykey):
-		return key_expand(mykey,self.dbapi)
+		return key_expand(mykey,mydb=self.dbapi)
 	
 	def dep_nomatch(self,mypkgdep):
 		mykey=dep_getkey(mypkgdep)
@@ -4028,7 +4028,7 @@
 		return nolist
 
 	def depcheck(self,mycheck,use="yes",myusesplit=None):
-		return dep_check(mycheck,self.dbapi,use=use,myusesplit=myusesplit)
+		return dep_check(mycheck,self.dbapi,use=use,myuse=myusesplit)
 
 	def populate(self):
 		"populates the tree with values"
@@ -4346,14 +4346,14 @@
 		cps=catpkgsplit(myspec)
 		if not cps:
 			return None
-		mykey=key_expand(cps[0]+"/"+cps[1],self.dbapi)
+		mykey=key_expand(cps[0]+"/"+cps[1],mydb=self.dbapi)
 		mykey=mykey+"-"+cps[2]
 		if cps[3]!="r0":
 			mykey=mykey+"-"+cps[3]
 		return mykey
 
 	def depcheck(self,mycheck,use="yes",myusesplit=None):
-		return dep_check(mycheck,self.dbapi,use=use,myusesplit=myusesplit)
+		return dep_check(mycheck,self.dbapi,use=use,myuse=myusesplit)
 
 	def getslot(self,mycatpkg):
 		"Get a slot for a catpkg; assume it exists."
@@ -4382,7 +4382,7 @@
 		raise NotImplementedError
 
 	def match(self,origdep,use_cache=1):
-		mydep=dep_expand(origdep,self)
+		mydep=dep_expand(origdep,mydb=self)
 		mykey=dep_getkey(mydep)
 		mycat=mykey.split("/")[0]
 		return match_from_list(mydep,self.cp_list(mykey,use_cache=use_cache))
@@ -4392,10 +4392,10 @@
 		match_from_list(mydep,mylist)
 
 	def counter_tick(self,myroot,mycpv=None):
-		return self.counter_tick_core(myroot,1,mycpv)
+		return self.counter_tick_core(myroot,incrementing=1,mycpv=mycpv)
 
 	def get_counter_tick_core(self,myroot,mycpv=None):
-		return self.counter_tick_core(myroot,0,mycpv)+1
+		return self.counter_tick_core(myroot,incrementing=0,mycpv=mycpv)+1
 
 	def counter_tick_core(self,myroot,incrementing=1,mycpv=None):
 		"This method will grab the next COUNTER value and record it back to the global file.  Returns new counter value."
@@ -4630,7 +4630,7 @@
 	def cpv_inject(self,mycpv):
 		"injects a real package into our on-disk database; assumes mycpv is valid and doesn't already exist"
 		os.makedirs(self.root+VDB_PATH+"/"+mycpv)	
-		counter=db[self.root]["vartree"].dbapi.counter_tick(self.root,mycpv)
+		counter=db[self.root]["vartree"].dbapi.counter_tick(self.root,mycpv=mycpv)
 		# write local package counter so that emerge clean does the right thing
 		lcfile=open(self.root+VDB_PATH+"/"+mycpv+"/COUNTER","w")
 		lcfile.write(str(counter))
@@ -4772,7 +4772,7 @@
 
 	def match(self,origdep,use_cache=1):
 		"caching match function"
-		mydep=dep_expand(origdep,self,use_cache=use_cache)
+		mydep=dep_expand(origdep,mydb=self,use_cache=use_cache)
 		mykey=dep_getkey(mydep)
 		mycat=mykey.split("/")[0]
 		if not use_cache:
@@ -4840,7 +4840,7 @@
 				myuse = grabfile(self.root+VDB_PATH+"/"+mycpv+"/USE")
 				myuse = string.split(string.join(myuse))
 				mylines = string.join(mylines)
-				mylines = portage_dep.use_reduce(portage_dep.paren_reduce(mylines), myuse)
+				mylines = portage_dep.use_reduce(portage_dep.paren_reduce(mylines), uselist=myuse)
 				for myprovide in mylines:
 					mys = catpkgsplit(myprovide)
 					if not mys:
@@ -4865,7 +4865,7 @@
 	def dep_bestmatch(self,mydep,use_cache=1):
 		"compatibility method -- all matches, not just visible ones"
 		#mymatch=best(match(dep_expand(mydep,self.dbapi),self.dbapi))
-		mymatch=best(self.dbapi.match(dep_expand(mydep,self.dbapi),use_cache=use_cache))
+		mymatch=best(self.dbapi.match(dep_expand(mydep,mydb=self.dbapi),use_cache=use_cache))
 		if mymatch==None:
 			return ""
 		else:
@@ -4894,7 +4894,7 @@
 		return self.dbapi.cp_all()
 
 	def exists_specific_cat(self,cpv,use_cache=1):
-		cpv=key_expand(cpv,self.dbapi,use_cache=use_cache)
+		cpv=key_expand(cpv,mydb=self.dbapi,use_cache=use_cache)
 		a=catpkgsplit(cpv)
 		if not a:
 			return 0
@@ -4913,7 +4913,7 @@
 		return self.root+VDB_PATH+"/"+fullpackage+"/"+package+".ebuild"
 
 	def getnode(self,mykey,use_cache=1):
-		mykey=key_expand(mykey,self.dbapi,use_cache=use_cache)
+		mykey=key_expand(mykey,mydb=self.dbapi,use_cache=use_cache)
 		if not mykey:
 			return []
 		mysplit=mykey.split("/")
@@ -4941,7 +4941,7 @@
 	
 	def hasnode(self,mykey,use_cache):
 		"""Does the particular node (cat/pkg key) exist?"""
-		mykey=key_expand(mykey,self.dbapi,use_cache=use_cache)
+		mykey=key_expand(mykey,mydb=self.dbapi,use_cache=use_cache)
 		mysplit=mykey.split("/")
 		mydirlist=listdir(self.root+VDB_PATH+"/"+mysplit[0],EmptyOnError=1)
 		for x in mydirlist:
@@ -5360,7 +5360,7 @@
 		useflags = string.split(mysettings["USE"])
 		
 		myurilist = portage_dep.paren_reduce(myuris)
-		myurilist = portage_dep.use_reduce(myurilist,useflags,matchall=all)
+		myurilist = portage_dep.use_reduce(myurilist,uselist=useflags,matchall=all)
 		newuris = flatten(myurilist)
 
 		myfiles = []
@@ -5398,7 +5398,7 @@
 		#
 		# we use getfetchsizes() now, so this function would be obsoleted
 		#
-		filesdict=self.getfetchsizes(mypkg,useflags,debug)
+		filesdict=self.getfetchsizes(mypkg,useflags=useflags,debug=debug)
 		if filesdict==None:
 			return "[empty/missing/bad digest]"
 		mysize=0
@@ -5409,7 +5409,7 @@
 	def cpv_exists(self,mykey):
 		"Tells us whether an actual ebuild exists on disk (no masking)"
 		cps2=mykey.split("/")
-		cps=catpkgsplit(mykey,0)
+		cps=catpkgsplit(mykey,silent=0)
 		if not cps:
 			#invalid cat/pkg-v
 			return 0
@@ -5471,7 +5471,7 @@
 		if not mydep:
 			#this stuff only runs on first call of xmatch()
 			#create mydep, mykey from origdep
-			mydep=dep_expand(origdep,self)
+			mydep=dep_expand(origdep,mydb=self)
 			mykey=dep_getkey(mydep)
 	
 		if level=="list-visible":
@@ -5480,7 +5480,7 @@
 			myval=self.gvisible(self.visible(self.cp_list(mykey)))
 		elif level=="bestmatch-visible":
 			#dep match -- best match of all visible packages
-			myval=best(self.xmatch("match-visible",None,mydep,mykey))
+			myval=best(self.xmatch("match-visible",None,mydep=mydep,mykey=mykey))
 			#get all visible matches (from xmatch()), then choose the best one
 		elif level=="bestmatch-list":
 			#dep match -- find best match but restrict search to sublist 
@@ -5491,7 +5491,7 @@
 			myval=match_from_list(mydep,mylist)
 		elif level=="match-visible":
 			#dep match -- find all visible matches
-			myval=match_from_list(mydep,self.xmatch("list-visible",None,mydep,mykey))
+			myval=match_from_list(mydep,self.xmatch("list-visible",None,mydep=mydep,mykey=mykey))
 			#get all visible packages, then get the matching ones
 		elif level=="match-all":
 			#match *all* visible *and* masked packages
@@ -5586,7 +5586,7 @@
 			pgroups=groups[:]
 			match=0
 			for mykey in pkgdict:
-				if db["/"]["porttree"].dbapi.xmatch("bestmatch-list", mykey, None, None, [mycpv]):
+				if db["/"]["porttree"].dbapi.xmatch("bestmatch-list", mykey, mylist=[mycpv]):
 					pgroups.extend(pkgdict[mykey])
 			for gp in mygroups:
 				if gp=="*":
@@ -5815,7 +5815,7 @@
 	def exists_specific(self,cpv):
 		if not self.populated:
 			self.populate()
-		return self.dbapi.match(dep_expand("="+cpv,self.dbapi))
+		return self.dbapi.match(dep_expand("="+cpv,mydb=self.dbapi))
 
 	def dep_bestmatch(self,mydep):
 		"compatibility method -- all matches, not just visible ones"
@@ -5823,7 +5823,7 @@
 			self.populate()
 		writemsg("\n\n", 1)
 		writemsg("mydep: %s\n" % mydep, 1)
-		mydep=dep_expand(mydep,self.dbapi)
+		mydep=dep_expand(mydep,mydb=self.dbapi)
 		writemsg("mydep: %s\n" % mydep, 1)
 		mykey=dep_getkey(mydep)
 		writemsg("mykey: %s\n" % mykey, 1)
@@ -6394,7 +6394,7 @@
 		# get current counter value (counter_tick also takes care of incrementing it)
 		# XXX Need to make this destroot, but it needs to be initialized first. XXX
 		# XXX bis: leads to some invalidentry() call through cp_all().
-		counter = db["/"]["vartree"].dbapi.counter_tick(self.myroot,self.mycpv)
+		counter = db["/"]["vartree"].dbapi.counter_tick(self.myroot,mycpv=self.mycpv)
 		# write local package counter for recording
 		lcfile = open(self.dbtmpdir+"/COUNTER","w")
 		lcfile.write(str(counter))
@@ -6589,9 +6589,9 @@
 						if self.isprotected(mydest):
 							# Use md5 of the target in ${D} if it exists...
 							if os.path.exists(os.path.normpath(srcroot+myabsto)):
-								mydest = new_protect_filename(myrealdest, portage_checksum.perform_md5(srcroot+myabsto))
+								mydest = new_protect_filename(myrealdest, newmd5=portage_checksum.perform_md5(srcroot+myabsto))
 							else:
-								mydest = new_protect_filename(myrealdest, portage_checksum.perform_md5(myabsto))
+								mydest = new_protect_filename(myrealdest, newmd5=portage_checksum.perform_md5(myabsto))
 								
 				# if secondhand==None it means we're operating in "force" mode and should not create a second hand.
 				if (secondhand!=None) and (not os.path.exists(myrealto)):
@@ -6601,7 +6601,7 @@
 					secondhand.append(mysrc[len(srcroot):])
 					continue
 				# unlinking no longer necessary; "movefile" will overwrite symlinks atomically and correctly
-				mymtime=movefile(mysrc,mydest,thismtime,mystat, mysettings=self.settings)
+				mymtime=movefile(mysrc,mydest,newmtime=thismtime,sstat=mystat, mysettings=self.settings)
 				if mymtime!=None:
 					print ">>>",mydest,"->",myto
 					outfile.write("sym "+myrealdest+" -> "+myto+" "+str(mymtime)+"\n")
@@ -6701,12 +6701,12 @@
 									del cfgfiledict[myrealdest][0]
 	
 						if cfgprot:
-							mydest = new_protect_filename(myrealdest, mymd5)
+							mydest = new_protect_filename(myrealdest, newmd5=mymd5)
 
 				# whether config protection or not, we merge the new file the
 				# same way.  Unless moveme=0 (blocking directory)
 				if moveme:
-					mymtime=movefile(mysrc,mydest,thismtime,mystat, mysettings=self.settings)
+					mymtime=movefile(mysrc,mydest,newmtime=thismtime,sstat=mystat, mysettings=self.settings)
 					if mymtime == None:
 						sys.exit(1)
 					zing=">>>"
@@ -6766,7 +6766,7 @@
 				zing="!!!"
 				if mydmode==None:
 					# destination doesn't exist
-					if movefile(mysrc,mydest,thismtime,mystat, mysettings=self.settings)!=None:
+					if movefile(mysrc,mydest,newmtime=thismtime,sstat=mystat, mysettings=self.settings)!=None:
 						zing=">>>"
 						if S_ISFIFO(mymode):
 							# we don't record device nodes in CONTENTS,