[gentoo-commits] proj/portage:prefix commit in: /

["Fabian Groffen" <grobian@gentoo.org>]

commit:     45f8d30649d45064e1d7c67eb4b567f5ac690a2f
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 19 18:29:38 2011 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Dec 19 18:29:38 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=45f8d306

Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix

Conflicts:
	pym/portage/data.py


 RELEASE-NOTES                                      |    5 -
 bin/ebuild.sh                                      |   18 ++++-
 bin/isolated-functions.sh                          |    6 +-
 bin/phase-functions.sh                             |    2 +-
 man/emerge.1                                       |   16 ++--
 man/make.conf.5                                    |    2 +-
 pym/_emerge/AbstractPollTask.py                    |   65 +++++++++++++++-
 pym/_emerge/AsynchronousLock.py                    |    4 +-
 pym/_emerge/BinpkgExtractorAsync.py                |    3 +-
 pym/_emerge/BlockerCache.py                        |    2 +-
 pym/_emerge/EbuildExecuter.py                      |    2 -
 pym/_emerge/FakeVartree.py                         |    2 -
 pym/_emerge/PipeReader.py                          |   60 +++++++++-----
 pym/_emerge/Scheduler.py                           |   14 ++++
 pym/_emerge/SpawnProcess.py                        |   50 ++++++------
 pym/_emerge/actions.py                             |   19 ++---
 pym/_emerge/depgraph.py                            |   59 +++++---------
 pym/_emerge/main.py                                |    7 +--
 pym/_emerge/resolver/backtracking.py               |    2 +-
 pym/portage/__init__.py                            |    3 +-
 pym/portage/data.py                                |   11 ++-
 pym/portage/locks.py                               |    2 +-
 .../package/ebuild/_config/special_env_vars.py     |    2 +-
 pym/portage/repository/config.py                   |   82 ++++++++++----------
 pym/portage/tests/ebuild/test_pty_eof.py           |   23 +-----
 pym/portage/tests/emerge/test_simple.py            |    4 +-
 pym/portage/tests/process/test_poll.py             |   58 ++++++++++++--
 pym/portage/util/_pty.py                           |   70 +++++++++--------
 28 files changed, 346 insertions(+), 247 deletions(-)

diff --cc pym/_emerge/depgraph.py
index 12b8439,93819c6..2e3ca4b
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@@ -7186,14 -7169,8 +7169,14 @@@ def _get_masking_status(pkg, pkgsetting
  			mreasons.append(_MaskReason("CHOST", "CHOST: %s" % \
  				pkg.metadata["CHOST"]))
  
 +	if pkg.built and not pkg.installed:
 +		if not "EPREFIX" in pkg.metadata:
 +			mreasons.append(_MaskReason("EPREFIX", "missing EPREFIX"))
 +		elif len(pkg.metadata["EPREFIX"].strip()) < len(pkgsettings["EPREFIX"]):
 +			mreasons.append(_MaskReason("EPREFIX", "EPREFIX: '%s' too small" % pkg.metadata["EPREFIX"]))
 +
  	if pkg.invalid:
- 		for msg_type, msgs in pkg.invalid.items():
+ 		for msgs in pkg.invalid.values():
  			for msg in msgs:
  				mreasons.append(
  					_MaskReason("invalid", "invalid: %s" % (msg,)))
diff --cc pym/portage/data.py
index b2aac06,ec750a6..1351c7f
--- a/pym/portage/data.py
+++ b/pym/portage/data.py
@@@ -90,16 -86,13 +90,21 @@@ def _get_global(k)
  			secpass = 2
  		#Discover the uid and gid of the portage user/group
  		try:
- 			portage_gid = grp.getgrnam(_get_global('_portage_grpname')).gr_gid
 -			portage_uid = pwd.getpwnam(_get_global('_portage_username')).pw_uid
+ 			_portage_grpname = _get_global('_portage_grpname')
+ 			if platform.python_implementation() == 'PyPy':
+ 				# Somehow this prevents "TypeError: expected string" errors
+ 				# from grp.getgrnam() with PyPy 1.7
+ 				_portage_grpname = str(_portage_grpname)
+ 			portage_gid = grp.getgrnam(_portage_grpname).gr_gid
 +		except KeyError:
 +			# PREFIX LOCAL: some sysadmins are insane, bug #344307
- 			if _get_global('_portage_grpname').isdigit():
- 				portage_gid = int(_get_global('_portage_grpname'))
++			if _portage_grpname.isdigit():
++				portage_gid = int(_portage_grpname)
 +			else:
 +				portage_gid = None
 +			# END PREFIX LOCAL
 +		try:
 +			portage_uid = pwd.getpwnam(_get_global('_portage_username')).pw_uid
  			if secpass < 1 and portage_gid in os.getgroups():
  				secpass = 1
  		except KeyError: