[patch] unmerge-speedup--without-normalization.patch

unmerge-speedup--without-normalization.patch (text/plain), 1.15 KB, created by TGL on 2003-12-16 05:02:12 UTC

--- pym.orig/portage.py	2003-12-10 23:44:34.000000000 +0100
+++ pym/portage.py	2003-12-13 18:47:19.139163464 +0100
@@ -4918,9 +4937,24 @@
 				sys.exit(123)
 
 		if pkgfiles:
-			mykeys=pkgfiles.keys()
-			mykeys.sort()
-			mykeys.reverse()
+			#unmerge-speedup: filter pkgfiles to remove obviously non-existing objects.
+			# Should be useful for unmerging already deleted kernel sources trees, etc. 
+			myorigkeys=pkgfiles.keys()
+			myorigkeys.sort()
+			mykeys=[]
+			while len(myorigkeys):
+				obj=myorigkeys.pop(0)
+				mykeys[:0]=[obj]
+				if pkgfiles[obj][0]=="dir" and not os.path.exists(obj):
+					# non existing dir -> forget his contents
+					while len(myorigkeys):
+						nextobj=myorigkeys[0]
+						if nextobj[:len(obj)+1]==obj+"/":
+							# this is some contents
+							del myorigkeys[0]
+						else:
+							# end of the contents
+							break
 
 			self.updateprotect()
 
@@ -4929,9 +4963,6 @@
 			mysyms=[]
 			modprotect="/lib/modules/"
 			for obj in mykeys:
-				obj=os.path.normpath(obj)
-				if obj[:2]=="//":
-					obj=obj[1:]
 				if not os.path.exists(obj):
 					if not os.path.islink(obj):
 						#we skip this if we're dealing with a symlink