From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 22 Nov 2006 06:40:59 +0000 (-0000)
Subject: Really fix bit mask support when preserving S_ISUID and S_ISGID in apply_permissions.
X-Git-Tag: v2.1.2~432
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ee07681c1a57f4e3509c2b7a0519c15bd69781be;p=portage.git

Really fix bit mask support when preserving S_ISUID and S_ISGID in apply_permissions.

svn path=/main/trunk/; revision=5117
---

diff --git a/pym/portage_util.py b/pym/portage_util.py
index 43d4fa8dd..baae9544e 100644
--- a/pym/portage_util.py
+++ b/pym/portage_util.py
@@ -560,13 +560,15 @@ def apply_permissions(filename, uid=-1, gid=-1, mode=-1, mask=-1,
 		(st_mode & stat.S_ISUID or st_mode & stat.S_ISGID):
 		if mode == -1:
 			new_mode = st_mode
-		elif mode & stat.S_ISUID or mode & stat.S_ISGID:
+		else:
 			mode = mode & 07777
 			if mask >= 0:
 				new_mode = mode | st_mode
 				new_mode = (mask ^ new_mode) & new_mode
 			else:
 				new_mode = mode
+			if not (new_mode & stat.S_ISUID or new_mode & stat.S_ISGID):
+				new_mode = -1
 
 	if not follow_links and stat.S_ISLNK(stat_cached.st_mode):
 		# Mode doesn't matter for symlinks.