[patch] Fixes against many files against 20040901

portage_fix_2.diff (text/plain), 12.31 KB, created by Michael Stewart (vericgar) (RETIRED) on 2004-09-04 15:23:41 UTC

diff -ur portage.20040901.orig/pym/cvstree.py portage/pym/cvstree.py
--- portage.20040901.orig/pym/cvstree.py	2004-08-15 23:47:24.000000000 -0700
+++ portage/pym/cvstree.py	2004-09-04 14:51:44.000000000 -0700
@@ -69,7 +69,7 @@
 				mylist.append(basedir+myfile)
 	if recursive:
 		for mydir in entries["dirs"].keys():
-			mylist+=findnew(entries["dirs"][mydir],recursive,basedir+mydir)
+			mylist+=findnew(entries["dirs"][mydir],recursive=recursive,basedir=(basedir+mydir))
 	return mylist
 					
 def findchanged(entries,recursive=0,basedir=""):
@@ -88,7 +88,7 @@
 						mylist.append(basedir+myfile)
 	if recursive:
 		for mydir in entries["dirs"].keys():
-			mylist+=findchanged(entries["dirs"][mydir],recursive,basedir+mydir)
+			mylist+=findchanged(entries["dirs"][mydir],recursive=recursive,basedir=(basedir+mydir))
 	return mylist
 	
 def findmissing(entries,recursive=0,basedir=""):
@@ -106,7 +106,7 @@
 					mylist.append(basedir+myfile)
 	if recursive:
 		for mydir in entries["dirs"].keys():
-			mylist+=findmissing(entries["dirs"][mydir],recursive,basedir+mydir)
+			mylist+=findmissing(entries["dirs"][mydir],recursive=recursive,basedir=(basedir+mydir))
 	return mylist
 
 def findunadded(entries,recursive=0,basedir=""):
@@ -124,7 +124,7 @@
 			mylist.append(basedir+myfile)
 	if recursive:
 		for mydir in entries["dirs"].keys():
-			mylist+=findunadded(entries["dirs"][mydir],recursive,basedir+mydir)
+			mylist+=findunadded(entries["dirs"][mydir],recursive=recursive,basedir=(basedir+mydir))
 	return mylist
 
 def findremoved(entries,recursive=0,basedir=""):
@@ -139,7 +139,7 @@
 			mylist.append(basedir+myfile)
 	if recursive:
 		for mydir in entries["dirs"].keys():
-			mylist+=findremoved(entries["dirs"][mydir],recursive,basedir+mydir)
+			mylist+=findremoved(entries["dirs"][mydir],recursive=recursive,basedir=(basedir+mydir))
 	return mylist
 
 def findall(entries, recursive=0, basedir=""):
@@ -149,11 +149,11 @@
 
 	if basedir and basedir[-1]!="/":
 		basedir=basedir+"/"
-	mynew     = findnew(entries,recursive,basedir)
-	mychanged = findchanged(entries,recursive,basedir)
-	mymissing = findmissing(entries,recursive,basedir)
-	myunadded = findunadded(entries,recursive,basedir)
-	myremoved = findremoved(entries,recursive,basedir)
+	mynew     = findnew(entries,recursive=recursive,basedir=basedir)
+	mychanged = findchanged(entries,recursive=recursive,basedir=basedir)
+	mymissing = findmissing(entries,recursive=recursive,basedir=basedir)
+	myunadded = findunadded(entries,recursive=recursive,basedir=basedir)
+	myremoved = findremoved(entries,recursive=recursive,basedir=basedir)
 	return [mynew, mychanged, mymissing, myunadded, myremoved]
 
 ignore_list = re.compile("(^|/)(RCS(|LOG)|SCCS|CVS(|\.adm)|cvslog\..*|tags|TAGS|\.(make\.state|nse_depinfo)|.*~|(\.|)#.*|,.*|_$.*|.*\$|\.del-.*|.*\.(old|BAK|bak|orig|rej|a|olb|o|obj|so|exe|Z|elc|ln)|core)$")
@@ -199,7 +199,7 @@
 				entries["dirs"][mysplit[1]]["status"]+=["exists"]
 				entries["dirs"][mysplit[1]]["flags"]=mysplit[2:]
 				if recursive:
-					rentries=getentries(mydir+"/"+mysplit[1],recursive)
+					rentries=getentries(mydir+"/"+mysplit[1],recursive=recursive)
 					#print rentries.keys()
 					#print entries["files"].keys()
 					#print entries["files"][mysplit[1]]
diff -ur portage.20040901.orig/pym/dcdialog.py portage/pym/dcdialog.py
--- portage.20040901.orig/pym/dcdialog.py	2003-11-10 00:30:55.000000000 -0800
+++ portage/pym/dcdialog.py	2004-09-04 15:12:47.000000000 -0700
@@ -395,7 +395,7 @@
     d.scrollbox(bigMessage)
 
     #<>#  Gauge Demo
-    d.gauge_start(0, 'percentage: 0', title='Gauge Demo')
+    d.gauge_start(perc=0, text='percentage: 0', title='Gauge Demo')
     for i in range(1, 101):
 	if i < 50:
 	    msg = 'percentage: %d' % i
@@ -403,7 +403,7 @@
 	    msg = 'Over 50%'
 	else:
 	    msg = ''
-	d.gauge_iterate(i, msg)
+	d.gauge_iterate(i, text=msg)
 	sleep(0.1)
     d.gauge_stop()
     #<>#
diff -ur portage.20040901.orig/pym/getbinpkg.py portage/pym/getbinpkg.py
--- portage.20040901.orig/pym/getbinpkg.py	2004-08-04 21:06:26.000000000 -0700
+++ portage/pym/getbinpkg.py	2004-09-04 14:57:42.000000000 -0700
@@ -266,11 +266,11 @@
 	else:
 		keepconnection = 1
 
-	conn,protocol,address,params,headers = create_conn(baseurl, conn)
+	conn,protocol,address,params,headers = create_conn(baseurl, conn=conn)
 
 	listing = None
 	if protocol in ["http","https"]:
-		page,rc,msg = make_http_request(conn,address,params,headers)
+		page,rc,msg = make_http_request(conn,address,params=params,headers=headers)
 		
 		if page:
 			parser = ParseLinks()
@@ -306,11 +306,11 @@
 	else:
 		keepconnection = 1
 
-	conn,protocol,address,params,headers = create_conn(baseurl, conn)
+	conn,protocol,address,params,headers = create_conn(baseurl, conn=conn)
 
 	if protocol in ["http","https"]:
 		headers["Range"] = "bytes=-"+str(chunk_size)
-		data,rc,msg = make_http_request(conn, address, params, headers)
+		data,rc,msg = make_http_request(conn, address, params=params, headers=headers)
 	elif protocol in ["ftp"]:
 		data,rc,msg = make_ftp_request(conn, address, -chunk_size)
 	else:
@@ -319,7 +319,7 @@
 	if data:
 		xpaksize = xpak.decodeint(data[-8:-4])
 		if (xpaksize+8) > chunk_size:
-			myid = file_get_metadata(baseurl, conn, (xpaksize+8))
+			myid = file_get_metadata(baseurl, conn=conn, chunk_size=(xpaksize+8))
 			if not keepconnection:
 				conn.close()
 			return myid
@@ -345,7 +345,7 @@
 	URL should be in the for <proto>://[user[:pass]@]<site>[:port]<path>"""
 
 	if not fcmd:
-		return file_get_lib(baseurl,dest,conn)
+		return file_get_lib(baseurl,dest,conn=conn)
 
 	fcmd = string.replace(fcmd, "${DISTDIR}", dest)
 	fcmd = string.replace(fcmd, "${URI}", baseurl)
@@ -378,11 +378,11 @@
 	else:
 		keepconnection = 1
 
-	conn,protocol,address,params,headers = create_conn(baseurl, conn)
+	conn,protocol,address,params,headers = create_conn(baseurl, conn=conn)
 
 	sys.stderr.write("Fetching '"+str(os.path.basename(address)+"'\n"))
 	if protocol in ["http","https"]:
-		data,rc,msg = make_http_request(conn, address, params, headers, dest=dest)
+		data,rc,msg = make_http_request(conn, address, params=params, headers=headers, dest=dest)
 	elif protocol in ["ftp"]:
 		data,rc,msg = make_ftp_request(conn, address, dest=dest)
 	else:
@@ -405,7 +405,7 @@
 	if makepickle == None:
 		makepickle = "/var/cache/edb/metadata.idx.most_recent"
 
-	conn,protocol,address,params,headers = create_conn(baseurl, conn)
+	conn,protocol,address,params,headers = create_conn(baseurl, conn=conn)
 
 	filedict = {}
 
@@ -427,7 +427,7 @@
 	if not metadata[baseurl].has_key("data"):
 		metadata[baseurl]["data"]={}
 
-	filelist = dir_get_list(baseurl, conn)
+	filelist = dir_get_list(baseurl, conn=conn)
 	tbz2list = match_in_array(filelist, suffix=".tbz2")
 	metalist = match_in_array(filelist, prefix="metadata.idx")
 	del filelist
@@ -445,7 +445,7 @@
 			for trynum in [1,2,3]:
 				mytempfile = tempfile.TemporaryFile()
 				try:
-					file_get(baseurl+"/"+mfile, mytempfile, conn)
+					file_get(baseurl+"/"+mfile, mytempfile, conn=conn)
 					if mytempfile.tell() > len(data):
 						mytempfile.seek(0)
 						data = mytempfile.read()
@@ -493,7 +493,7 @@
 		    (x not in metadata[baseurl]["data"].keys())):
 			sys.stderr.write(yellow("x"))
 			metadata[baseurl]["modified"] = 1
-			myid = file_get_metadata(baseurl+"/"+x, conn, chunk_size)
+			myid = file_get_metadata(baseurl+"/"+x, conn=conn, chunk_size=chunk_size)
 		
 			if myid[0]:
 				metadata[baseurl]["data"][x] = make_metadata_dict(myid)
diff -ur portage.20040901.orig/pym/portage.py portage/pym/portage.py
--- portage.20040901.orig/pym/portage.py	2004-09-01 19:24:15.000000000 -0700
+++ portage/pym/portage.py	2004-09-04 14:42:35.000000000 -0700
@@ -2369,7 +2369,7 @@
 	if mydo=="manifest":
 		return (not digestgen(checkme,mysettings,overwrite=1,manifestonly=1))
 	
-	if not digestcheck(checkme, mysettings, ("strict" in features)):
+	if not digestcheck(checkme, mysettings, strict=("strict" in features)):
 		return 1
 	
 	if mydo=="fetch":
diff -ur portage.20040901.orig/pym/portage_checksum.py portage/pym/portage_checksum.py
--- portage.20040901.orig/pym/portage_checksum.py	2004-09-01 14:06:00.000000000 -0700
+++ portage/pym/portage_checksum.py	2004-09-04 15:00:04.000000000 -0700
@@ -20,10 +20,10 @@
 	del results
 
 def perform_md5(x, calc_prelink=0):
-	return perform_checksum(x, md5hash, calc_prelink)[0]
+	return perform_checksum(x, hash_function=md5hash, calc_prelink=calc_prelink)[0]
 
 def perform_sha1(x, calc_prelink=0):
-	return perform_checksum(x, sha1hash, calc_prelink)[0]
+	return perform_checksum(x, hash_function=sha1hash, calc_prelink=calc_prelink)[0]
 
 # We _try_ to load this module. If it fails we do the slow fallback.
 try:
diff -ur portage.20040901.orig/pym/portage_dep.py portage/pym/portage_dep.py
--- portage.20040901.orig/pym/portage_dep.py	2004-08-14 12:49:47.000000000 -0700
+++ portage/pym/portage_dep.py	2004-09-04 15:06:44.000000000 -0700
@@ -38,7 +38,7 @@
 			return mylist,mystr[1:]
 		elif ("(" in mystr) and (mystr.index("(") < mystr.index(")")):
 			freesec,subsec = mystr.split("(",1)
-			subsec,tail = paren_reduce(subsec,tokenize)
+			subsec,tail = paren_reduce(subsec,tokenize=tokenize)
 		else:
 			subsec,tail = mystr.split(")",1)
 			if tokenize:
@@ -82,7 +82,7 @@
 		head = mydeparray.pop(0)
 
 		if type(head) == types.ListType:
-			rlist = rlist + [use_reduce(head, uselist, masklist, matchall, excludeall)]
+			rlist = rlist + [use_reduce(head, uselist=uselist, masklist=masklist, matchall=matchall, excludeall=excludeall)]
 
 		else:
 			if head[-1] == "?": # Use reduce next group on fail.
@@ -125,7 +125,7 @@
 				if ismatch:
 					target = newdeparray[-1]
 					if isinstance(target, list):
-						rlist += [use_reduce(target, uselist, masklist, matchall, excludeall)]
+						rlist += [use_reduce(target, uselist=uselist, masklist=masklist, matchall=matchall, excludeall=excludeall)]
 					else:
 						rlist += [target]
 
diff -ur portage.20040901.orig/pym/portage_gpg.py portage/pym/portage_gpg.py
--- portage.20040901.orig/pym/portage_gpg.py	2004-08-24 22:25:08.000000000 -0700
+++ portage/pym/portage_gpg.py	2004-09-04 15:08:16.000000000 -0700
@@ -65,7 +65,7 @@
 
 		self.keyringStats = fileStats(keyringPath)
 		self.minimumTrust = TRUSTED
-		if not self.verify(keyringPath, keyringPath+".asc"):
+		if not self.verify(keyringPath, sigfile=(keyringPath+".asc")):
 			self.keyringIsTrusted = False
 			if requireSignedRing:
 				raise portage_exception.InvalidSignature, "Required keyring verification: "+keyringPath
diff -ur portage.20040901.orig/pym/portage_locks.py portage/pym/portage_locks.py
--- portage.20040901.orig/pym/portage_locks.py	2004-08-16 13:06:38.000000000 -0700
+++ portage/pym/portage_locks.py	2004-09-04 14:54:32.000000000 -0700
@@ -77,7 +77,7 @@
 		# The file was deleted on us... Keep trying to make one...
 		os.close(myfd)
 		portage_util.writemsg("lockfile recurse\n",1)
-		lockfilename,myfd,unlinkfile = lockfile(mypath,wantnewlockfile,unlinkfile)
+		lockfilename,myfd,unlinkfile = lockfile(mypath,wantnewlockfile=wantnewlockfile,unlinkfile=unlinkfile)
 
 	portage_util.writemsg(str((lockfilename,myfd,unlinkfile))+"\n",1)
 	return (lockfilename,myfd,unlinkfile)
diff -ur portage.20040901.orig/pym/portage_util.py portage/pym/portage_util.py
--- portage.20040901.orig/pym/portage_util.py	2004-08-30 19:46:13.000000000 -0700
+++ portage/pym/portage_util.py	2004-09-04 15:07:18.000000000 -0700
@@ -139,7 +139,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])
@@ -233,7 +233,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
diff -ur portage.20040901.orig/pym/xpak.py portage/pym/xpak.py
--- portage.20040901.orig/pym/xpak.py	2003-12-24 19:06:09.000000000 -0800
+++ portage/pym/xpak.py	2004-09-04 15:00:42.000000000 -0700
@@ -242,7 +242,7 @@
 		return self.unpackinfo(datadir)
 	def compose(self,datadir,cleanup=0):
 		"""Alias for recompose()."""
-		return recompose(datadir,cleanup)
+		return recompose(datadir,cleanup=cleanup)
 	def recompose(self,datadir,cleanup=0):
 		"""Creates an xpak segment from the datadir provided, truncates the tbz2
 		to the end of regular data if an xpak segment already exists, and adds