[gentoo-commits] proj/portage:prefix commit in: pym/portage/package/ebuild/, pym/portage/tests/, pym/portage/

[gentoo-commits] proj/portage:prefix commit in: pym/portage/package/ebuild/, pym/portage/tests/, pym/portage/

[Fabian Groffen]

commit:     1604d62c29ac8266e48c4885fa50e37350a7dc55
Author:     Ruud Koolen <redlizard <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  8 08:26:18 2014 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Feb  8 08:26:18 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=1604d62c

portage_gid: allow numeric groups

A previous fix somehow got lost, but again, do some additional work to
allow for (foobared) setups with numeric groups.

---
 pym/portage/data.py                    | 25 ++++++++++++++++---------
 pym/portage/package/ebuild/doebuild.py |  4 ++++
 pym/portage/tests/runTests             | 10 ++++++++--
 3 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/pym/portage/data.py b/pym/portage/data.py
index 59ce1b5..f4bbb44 100644
--- a/pym/portage/data.py
+++ b/pym/portage/data.py
@@ -91,21 +91,28 @@ def _get_global(k):
 		#Discover the uid and gid of the portage user/group
 		keyerror = False
 		try:
-			portage_uid = pwd.getpwnam(_get_global('_portage_username')).pw_uid
+			username = str(_get_global('_portage_username'))
+			portage_uid = pwd.getpwnam(username).pw_uid
 		except KeyError:
 			# PREFIX LOCAL: some sysadmins are insane, bug #344307
-			if _portage_grpname.isdigit():
-				portage_gid = int(_portage_grpname)
+			if username.isdigit():
+				portage_uid = int(username)
 			else:
 				keyerror = True
+				portage_uid = 0
 			# END PREFIX LOCAL
-			portage_uid = 0
 
 		try:
-			portage_gid = grp.getgrnam(_get_global('_portage_grpname')).gr_gid
+			grpname = str(_get_global('_portage_grpname'))
+			portage_gid = grp.getgrnam(grpname).gr_gid
 		except KeyError:
-			keyerror = True
-			portage_gid = 0
+			# PREFIX LOCAL: some sysadmins are insane, bug #344307
+			if grpname.isdigit():
+				portage_gid = int(grpname)
+			else:
+				keyerror = True
+				portage_gid = 0
+			# END PREFIX LOCAL
 
 		if secpass < 1 and portage_gid in os.getgroups():
 			secpass = 1
@@ -203,14 +210,14 @@ def _get_global(k):
 					try:
 						grp_struct = grp.getgrgid(eroot_st.st_gid)
 					except KeyError:
-						pass
+						v = eroot_st.st_gid
 					else:
 						v = grp_struct.gr_name
 				else:
 					try:
 						pwd_struct = pwd.getpwuid(eroot_st.st_uid)
 					except KeyError:
-						pass
+						v = eroot_st.st_uid
 					else:
 						v = pwd_struct.pw_name
 

diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py
index 2f08593..3c2167a 100644
--- a/pym/portage/package/ebuild/doebuild.py
+++ b/pym/portage/package/ebuild/doebuild.py
@@ -1527,6 +1527,8 @@ def spawn(mystring, mysettings, debug=False, free=False, droppriv=False,
 				user = "root"
 			elif portage_build_uid == portage_uid:
 				user = portage.data._portage_username
+			else:
+				user = portage_uid
 		if user is not None:
 			mysettings["PORTAGE_BUILD_USER"] = user
 
@@ -1539,6 +1541,8 @@ def spawn(mystring, mysettings, debug=False, free=False, droppriv=False,
 				group = "root"
 			elif portage_build_gid == portage_gid:
 				group = portage.data._portage_grpname
+			else:
+				group = portage_gid
 		if group is not None:
 			mysettings["PORTAGE_BUILD_GROUP"] = group
 

diff --git a/pym/portage/tests/runTests b/pym/portage/tests/runTests
index 0ad9715..a80668b 100755
--- a/pym/portage/tests/runTests
+++ b/pym/portage/tests/runTests
@@ -24,8 +24,14 @@ signal.signal(debug_signum, debug_signal)
 # Pretend that the current user's uid/gid are the 'portage' uid/gid,
 # so things go smoothly regardless of the current user and global
 # user/group configuration.
-os.environ["PORTAGE_USERNAME"] = pwd.getpwuid(os.getuid()).pw_name
-os.environ["PORTAGE_GRPNAME"] = grp.getgrgid(os.getgid()).gr_name
+try:
+	os.environ["PORTAGE_USERNAME"] = pwd.getpwuid(os.getuid()).pw_name
+except KeyError:
+	os.environ["PORTAGE_USERNAME"] = str(os.getuid())
+try:
+	os.environ["PORTAGE_GRPNAME"] = grp.getgrgid(os.getgid()).gr_name
+except KeyError:
+	os.environ["PORTAGE_GRPNAME"] = str(os.getgid())
 
 # Insert our parent dir so we can do shiny import "tests"
 # This line courtesy of Marienz and Pkgcore ;)