| 1 |
commit: 1604d62c29ac8266e48c4885fa50e37350a7dc55 |
| 2 |
Author: Ruud Koolen <redlizard <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Feb 8 08:26:18 2014 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Feb 8 08:26:18 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=1604d62c |
| 7 |
|
| 8 |
portage_gid: allow numeric groups |
| 9 |
|
| 10 |
A previous fix somehow got lost, but again, do some additional work to |
| 11 |
allow for (foobared) setups with numeric groups. |
| 12 |
|
| 13 |
--- |
| 14 |
pym/portage/data.py | 25 ++++++++++++++++--------- |
| 15 |
pym/portage/package/ebuild/doebuild.py | 4 ++++ |
| 16 |
pym/portage/tests/runTests | 10 ++++++++-- |
| 17 |
3 files changed, 28 insertions(+), 11 deletions(-) |
| 18 |
|
| 19 |
diff --git a/pym/portage/data.py b/pym/portage/data.py |
| 20 |
index 59ce1b5..f4bbb44 100644 |
| 21 |
--- a/pym/portage/data.py |
| 22 |
+++ b/pym/portage/data.py |
| 23 |
@@ -91,21 +91,28 @@ def _get_global(k): |
| 24 |
#Discover the uid and gid of the portage user/group |
| 25 |
keyerror = False |
| 26 |
try: |
| 27 |
- portage_uid = pwd.getpwnam(_get_global('_portage_username')).pw_uid |
| 28 |
+ username = str(_get_global('_portage_username')) |
| 29 |
+ portage_uid = pwd.getpwnam(username).pw_uid |
| 30 |
except KeyError: |
| 31 |
# PREFIX LOCAL: some sysadmins are insane, bug #344307 |
| 32 |
- if _portage_grpname.isdigit(): |
| 33 |
- portage_gid = int(_portage_grpname) |
| 34 |
+ if username.isdigit(): |
| 35 |
+ portage_uid = int(username) |
| 36 |
else: |
| 37 |
keyerror = True |
| 38 |
+ portage_uid = 0 |
| 39 |
# END PREFIX LOCAL |
| 40 |
- portage_uid = 0 |
| 41 |
|
| 42 |
try: |
| 43 |
- portage_gid = grp.getgrnam(_get_global('_portage_grpname')).gr_gid |
| 44 |
+ grpname = str(_get_global('_portage_grpname')) |
| 45 |
+ portage_gid = grp.getgrnam(grpname).gr_gid |
| 46 |
except KeyError: |
| 47 |
- keyerror = True |
| 48 |
- portage_gid = 0 |
| 49 |
+ # PREFIX LOCAL: some sysadmins are insane, bug #344307 |
| 50 |
+ if grpname.isdigit(): |
| 51 |
+ portage_gid = int(grpname) |
| 52 |
+ else: |
| 53 |
+ keyerror = True |
| 54 |
+ portage_gid = 0 |
| 55 |
+ # END PREFIX LOCAL |
| 56 |
|
| 57 |
if secpass < 1 and portage_gid in os.getgroups(): |
| 58 |
secpass = 1 |
| 59 |
@@ -203,14 +210,14 @@ def _get_global(k): |
| 60 |
try: |
| 61 |
grp_struct = grp.getgrgid(eroot_st.st_gid) |
| 62 |
except KeyError: |
| 63 |
- pass |
| 64 |
+ v = eroot_st.st_gid |
| 65 |
else: |
| 66 |
v = grp_struct.gr_name |
| 67 |
else: |
| 68 |
try: |
| 69 |
pwd_struct = pwd.getpwuid(eroot_st.st_uid) |
| 70 |
except KeyError: |
| 71 |
- pass |
| 72 |
+ v = eroot_st.st_uid |
| 73 |
else: |
| 74 |
v = pwd_struct.pw_name |
| 75 |
|
| 76 |
|
| 77 |
diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py |
| 78 |
index 2f08593..3c2167a 100644 |
| 79 |
--- a/pym/portage/package/ebuild/doebuild.py |
| 80 |
+++ b/pym/portage/package/ebuild/doebuild.py |
| 81 |
@@ -1527,6 +1527,8 @@ def spawn(mystring, mysettings, debug=False, free=False, droppriv=False, |
| 82 |
user = "root" |
| 83 |
elif portage_build_uid == portage_uid: |
| 84 |
user = portage.data._portage_username |
| 85 |
+ else: |
| 86 |
+ user = portage_uid |
| 87 |
if user is not None: |
| 88 |
mysettings["PORTAGE_BUILD_USER"] = user |
| 89 |
|
| 90 |
@@ -1539,6 +1541,8 @@ def spawn(mystring, mysettings, debug=False, free=False, droppriv=False, |
| 91 |
group = "root" |
| 92 |
elif portage_build_gid == portage_gid: |
| 93 |
group = portage.data._portage_grpname |
| 94 |
+ else: |
| 95 |
+ group = portage_gid |
| 96 |
if group is not None: |
| 97 |
mysettings["PORTAGE_BUILD_GROUP"] = group |
| 98 |
|
| 99 |
|
| 100 |
diff --git a/pym/portage/tests/runTests b/pym/portage/tests/runTests |
| 101 |
index 0ad9715..a80668b 100755 |
| 102 |
--- a/pym/portage/tests/runTests |
| 103 |
+++ b/pym/portage/tests/runTests |
| 104 |
@@ -24,8 +24,14 @@ signal.signal(debug_signum, debug_signal) |
| 105 |
# Pretend that the current user's uid/gid are the 'portage' uid/gid, |
| 106 |
# so things go smoothly regardless of the current user and global |
| 107 |
# user/group configuration. |
| 108 |
-os.environ["PORTAGE_USERNAME"] = pwd.getpwuid(os.getuid()).pw_name |
| 109 |
-os.environ["PORTAGE_GRPNAME"] = grp.getgrgid(os.getgid()).gr_name |
| 110 |
+try: |
| 111 |
+ os.environ["PORTAGE_USERNAME"] = pwd.getpwuid(os.getuid()).pw_name |
| 112 |
+except KeyError: |
| 113 |
+ os.environ["PORTAGE_USERNAME"] = str(os.getuid()) |
| 114 |
+try: |
| 115 |
+ os.environ["PORTAGE_GRPNAME"] = grp.getgrgid(os.getgid()).gr_name |
| 116 |
+except KeyError: |
| 117 |
+ os.environ["PORTAGE_GRPNAME"] = str(os.getgid()) |
| 118 |
|
| 119 |
# Insert our parent dir so we can do shiny import "tests" |
| 120 |
# This line courtesy of Marienz and Pkgcore ;) |
Archives