[gentoo-portage-dev] PATCH: Only use lchown on symlinks (#98827)

[Jason Stubbs <jstubbs@gentoo.org>]

[-- Attachment #1.1: Type: text/plain, Size: 432 bytes --]

On Monday 18 July 2005 12:13, Jason Stubbs wrote:
> http://bugs.gentoo.org/show_bug.cgi?id=98827
> 
> Making lchown a no-op should fix all these cases without any regressions.

Marius pointed out that lchown is currently used on regular files as well as
symlinks. This patch separates the usage of os.chown and lchown such that
os.chown is only used on non-symlinks and lchown is only used on symlinks.

-- 
Jason Stubbs

[-- Attachment #1.2: 98827_lchown_normal_files.patch --]
[-- Type: text/x-diff, Size: 1173 bytes --]

--- /usr/lib/portage/pym/portage.py	2005-07-15 23:53:30.843708096 +0900
+++ portage.py	2005-07-19 00:57:43.169904000 +0900
@@ -2866,7 +2866,10 @@
 					return None # failure
 		try:
 			if didcopy:
-				lchown(dest,sstat[stat.ST_UID],sstat[stat.ST_GID])
+				if stat.S_ISLNK(sstat[stat.ST_MODE]):
+					lchown(dest,sstat[stat.ST_UID],sstat[stat.ST_GID])
+				else
+					os.chown(dest,sstat[stat.ST_UID],sstat[stat.ST_GID])
 				os.chmod(dest, stat.S_IMODE(sstat[stat.ST_MODE])) # Sticky is reset on chown
 				os.unlink(src)
 		except SystemExit, e:
@@ -6739,7 +6742,7 @@
 						if bsd_chflags:
 							bsd_chflags.lchflags(mydest, dflags)
 						os.chmod(mydest,mystat[0])
-						lchown(mydest,mystat[4],mystat[5])
+						os.chown(mydest,mystat[4],mystat[5])
 						print ">>>",mydest+"/"
 				else:
 					#destination doesn't exist
@@ -6751,7 +6754,7 @@
 					os.chmod(mydest,mystat[0])
 					if bsd_chflags:
 						bsd_chflags.lchflags(mydest, bsd_chflags.lgetflags(mysrc))
-					lchown(mydest,mystat[4],mystat[5])
+					os.chown(mydest,mystat[4],mystat[5])
 					print ">>>",mydest+"/"
 				outfile.write("dir "+myrealdest+"\n")
 				# recurse and merge this directory

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]