[patch] Simpler patch that keeps current behaviour except dying when .keep cannot be written

portage-2.0.50-r4-keep2.patch (text/plain), 1.71 KB, created by Jason Stubbs (RETIRED) on 2004-04-11 18:26:52 UTC

--- /usr/lib/portage/pym/portage.py	2004-04-12 10:18:44.962292928 +0900
+++ portage.py	2004-04-12 10:18:21.216902776 +0900
@@ -6024,15 +6024,6 @@
 				# we are merging a directory
 				if mydmode!=None:
 					# destination exists
-					if not os.access(mydest, os.W_OK):
-						pkgstuff = pkgsplit(self.pkg)
-						writemsg("\n!!! Cannot write to '"+mydest+"'.\n")
-						writemsg("!!! Please check permissions and directories for broken symlinks.\n")
-						writemsg("!!! You may start the merge process again by using ebuild:\n")
-						writemsg("!!! ebuild "+self.settings["PORTDIR"]+"/"+self.cat+"/"+pkgstuff[0]+"/"+self.pkg+".ebuild merge\n")
-						writemsg("!!! And finish by running this: env-update\n\n")
-						return 1
-
 					if S_ISLNK(mydmode) or S_ISDIR(mydmode):
 						# a symlink to an existing directory will work for us; keep it:
 						print "---",mydest+"/"
@@ -6119,8 +6110,18 @@
 				if moveme:
 					mymtime=movefile(mysrc,mydest,thismtime,mystat, mysettings=self.settings)
 					if mymtime == None:
-						sys.exit(1)
-					zing=">>>"
+						if os.path.basename(mydest)==".keep":
+							zing = "!!!"
+						else:
+							pkgstuff = pkgsplit(self.pkg)
+							writemsg("\n!!! Cannot write to '"+os.path.dirname(mydest)+"'.\n")
+							writemsg("!!! Please check permissions and directories for broken symlinks.\n")
+							writemsg("!!! You may start the merge process again by using ebuild:\n")
+							writemsg("!!! ebuild "+self.settings["PORTDIR"]+"/"+self.cat+"/"+pkgstuff[0]+"/"+self.pkg+".ebuild merge\n")
+							writemsg("!!! And finish by running this: env-update\n\n")
+							return 1
+					else:
+						zing=">>>"
 				else:
 					mymtime=thismtime
 					# We need to touch the destination so that on --update the