| 1 |
Author: zmedico |
| 2 |
Date: 2010-01-30 10:33:07 +0000 (Sat, 30 Jan 2010) |
| 3 |
New Revision: 15279 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/portage/data.py |
| 7 |
Log: |
| 8 |
Fix conditional logic for userpriv_groups intialization. |
| 9 |
|
| 10 |
|
| 11 |
Modified: main/trunk/pym/portage/data.py |
| 12 |
=================================================================== |
| 13 |
--- main/trunk/pym/portage/data.py 2010-01-30 09:46:28 UTC (rev 15278) |
| 14 |
+++ main/trunk/pym/portage/data.py 2010-01-30 10:33:07 UTC (rev 15279) |
| 15 |
@@ -96,22 +96,23 @@ |
| 16 |
writemsg(colorize("GOOD", " portage::250:portage") + "\n", |
| 17 |
noiselevel=-1) |
| 18 |
portage_group_warning() |
| 19 |
- |
| 20 |
-userpriv_groups = [portage_gid] |
| 21 |
-if secpass >= 2: |
| 22 |
- # Get a list of group IDs for the portage user. Do not use grp.getgrall() |
| 23 |
- # since it is known to trigger spurious SIGPIPE problems with nss_ldap. |
| 24 |
- try: |
| 25 |
- from subprocess import getstatusoutput |
| 26 |
- except ImportError: |
| 27 |
- from commands import getstatusoutput |
| 28 |
- mystatus, myoutput = getstatusoutput("id -G portage") |
| 29 |
- if mystatus == os.EX_OK: |
| 30 |
- for x in myoutput.split(): |
| 31 |
- try: |
| 32 |
- userpriv_groups.append(int(x)) |
| 33 |
- except ValueError: |
| 34 |
- pass |
| 35 |
- del x |
| 36 |
- userpriv_groups = list(set(userpriv_groups)) |
| 37 |
- del getstatusoutput, mystatus, myoutput |
| 38 |
+else: |
| 39 |
+ userpriv_groups = [portage_gid] |
| 40 |
+ if secpass >= 2: |
| 41 |
+ # Get a list of group IDs for the portage user. Do not use |
| 42 |
+ # grp.getgrall() since it is known to trigger spurious |
| 43 |
+ # SIGPIPE problems with nss_ldap. |
| 44 |
+ try: |
| 45 |
+ from subprocess import getstatusoutput |
| 46 |
+ except ImportError: |
| 47 |
+ from commands import getstatusoutput |
| 48 |
+ mystatus, myoutput = getstatusoutput("id -G portage") |
| 49 |
+ if mystatus == os.EX_OK: |
| 50 |
+ for x in myoutput.split(): |
| 51 |
+ try: |
| 52 |
+ userpriv_groups.append(int(x)) |
| 53 |
+ except ValueError: |
| 54 |
+ pass |
| 55 |
+ del x |
| 56 |
+ userpriv_groups = list(set(userpriv_groups)) |
| 57 |
+ del getstatusoutput, mystatus, myoutput |
Archives