[gentoo-commits] portage r15518 - main/branches/2.1.7/pym/portage

[Zac Medico (zmedico)]

Author: zmedico
Date: 2010-03-02 18:25:32 +0000 (Tue, 02 Mar 2010)
New Revision: 15518

Modified:
   main/branches/2.1.7/pym/portage/data.py
Log:
Fix conditional logic for userpriv_groups intialization. (trunk r15279)

Modified: main/branches/2.1.7/pym/portage/data.py
===================================================================
--- main/branches/2.1.7/pym/portage/data.py	2010-03-02 18:24:31 UTC (rev 15517)
+++ main/branches/2.1.7/pym/portage/data.py	2010-03-02 18:25:32 UTC (rev 15518)
@@ -96,22 +96,23 @@
 	writemsg(colorize("GOOD", "         portage::250:portage") + "\n",
 		noiselevel=-1)
 	portage_group_warning()
-
-userpriv_groups = [portage_gid]
-if secpass >= 2:
-	# Get a list of group IDs for the portage user.  Do not use grp.getgrall()
-	# since it is known to trigger spurious SIGPIPE problems with nss_ldap.
-	try:
-		from subprocess import getstatusoutput
-	except ImportError:
-		from commands import getstatusoutput
-	mystatus, myoutput = getstatusoutput("id -G portage")
-	if mystatus == os.EX_OK:
-		for x in myoutput.split():
-			try:
-				userpriv_groups.append(int(x))
-			except ValueError:
-				pass
-			del x
-		userpriv_groups = list(set(userpriv_groups))
-	del getstatusoutput, mystatus, myoutput
+else:
+	userpriv_groups = [portage_gid]
+	if secpass >= 2:
+		# Get a list of group IDs for the portage user. Do not use
+		# grp.getgrall() since it is known to trigger spurious
+		# SIGPIPE problems with nss_ldap.
+		try:
+			from subprocess import getstatusoutput
+		except ImportError:
+			from commands import getstatusoutput
+		mystatus, myoutput = getstatusoutput("id -G portage")
+		if mystatus == os.EX_OK:
+			for x in myoutput.split():
+				try:
+					userpriv_groups.append(int(x))
+				except ValueError:
+					pass
+				del x
+			userpriv_groups = list(set(userpriv_groups))
+		del getstatusoutput, mystatus, myoutput