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

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

commit:     680c4144051d0b72a0066de5dbec2f20e8d0d71b
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Dec  3 16:47:25 2011 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Dec  3 16:47:25 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=680c4144

portageq: fix root/eroot handling for Prefix

__PORTAGE_TEST_EPREFIX will almost always be empty, hence the code
believes that no offset prefix is in use.  In Prefix, this is always on
the contrary, so when not set, use the hardwired EPREFIX from
portage.const.  This avoids double prefixes seen for the portageq
functions, and hence funcs like has_version always return false.

---
 bin/portageq |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/bin/portageq b/bin/portageq
index fe980a2..27a77a8 100755
--- a/bin/portageq
+++ b/bin/portageq
@@ -843,6 +843,10 @@ def main():
 			sys.stderr.flush()
 			sys.exit(os.EX_USAGE)
 		eprefix = os.environ.get("__PORTAGE_TEST_EPREFIX")
+		# PREFIX LOCAL: make sure we fall back to our hardwired EPREFIX
+		if not eprefix:
+			eprefix = portage.const.EPREFIX
+		# END PREFIX LOCAL
 		eroot = portage.util.normalize_path(sys.argv[2])
 		if eprefix:
 			root = eroot[:1-len(eprefix)]