[patch] locks-chmod.patch

locks-chmod.patch (text/plain), 1.13 KB, created by i.Dark_Templar on 2017-02-28 12:42:23 UTC

--- pym/portage/locks.py.back	2017-02-28 15:23:47.269828461 +0300
+++ pym/portage/locks.py	2017-02-28 15:33:34.798483342 +0300
@@ -162,8 +162,9 @@
 					raise
 
 			if not preexisting:
+				lock_stat = os.stat(lockfilename)
 				try:
-					if os.stat(lockfilename).st_gid != portage_gid:
+					if lock_stat.st_gid != portage_gid:
 						os.chown(lockfilename, -1, portage_gid)
 				except OSError as e:
 					if e.errno in (errno.ENOENT, errno.ESTALE):
@@ -179,6 +180,20 @@
 						writemsg(_("Group IDs of current user: %s\n") % \
 							" ".join(str(n) for n in os.getgroups()),
 							noiselevel=-1)
+				try:
+					if (lock_stat.st_mode & 0o777) != 0o660:
+						os.chmod(lockfilename, 0o660)
+				except OSError as e:
+					if e.errno in (errno.ENOENT, errno.ESTALE):
+						return lockfile(mypath,
+							wantnewlockfile=wantnewlockfile,
+							unlinkfile=unlinkfile, waiting_msg=waiting_msg,
+							flags=flags)
+					else:
+						writemsg("%s: chmod('%s', 0o660)\n" % \
+							(e, lockfilename), noiselevel=-1)
+						writemsg(_("Cannot chmod a lockfile: '%s'\n") % \
+							lockfilename, noiselevel=-1)
 		finally:
 			os.umask(old_mask)