[patch] config-protect-root.patch

patch (text/plain), 1.99 KB, created by Georgi Georgiev on 2005-03-14 22:38:42 UTC

--- /usr/lib/portage/pym/portage.py.old	2005-03-15 14:17:00.000000000 +0900
+++ /usr/lib/portage/pym/portage.py	2005-03-15 15:33:36.000000000 +0900
@@ -6551,7 +6551,7 @@
 			# We need mydest defined up here to calc. protection paths.  This is now done once per
 			# directory rather than once per file merge.  This should really help merge performance.
 			# Trailing / ensures that protects/masks with trailing /'s match.
-			mytruncpath="/"+offset+"/"
+			mytruncpath=self.myroot+offset+"/"
 			myppath=self.isprotected(mytruncpath)
 		else:
 			mergelist=stufftomerge
@@ -6621,9 +6621,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, newmd5=portage_checksum.perform_md5(srcroot+myabsto))
+								mydest = new_protect_filename(mydest, newmd5=portage_checksum.perform_md5(srcroot+myabsto))
 							else:
-								mydest = new_protect_filename(myrealdest, newmd5=portage_checksum.perform_md5(myabsto))
+								mydest = new_protect_filename(mydest, 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)):
@@ -6755,7 +6755,7 @@
 									del cfgfiledict[myrealdest][0]
 	
 						if cfgprot:
-							mydest = new_protect_filename(myrealdest, newmd5=mymd5)
+							mydest = new_protect_filename(mydest, newmd5=mymd5)
 
 				# whether config protection or not, we merge the new file the
 				# same way.  Unless moveme=0 (blocking directory)
@@ -6768,7 +6768,7 @@
 					mymtime=thismtime
 					# We need to touch the destination so that on --update the
 					# old package won't yank the file with it. (non-cfgprot related)
-					os.utime(myrealdest,(thismtime,thismtime))
+					os.utime(mydest,(thismtime,thismtime))
 					zing="---"
 				if self.settings["USERLAND"] == "Darwin" and myrealdest[-2:] == ".a":