[gentoo-commits] proj/mirrorselect:master commit in: mirrorselect/

["Brian Dolbec" <brian.dolbec@gmail.com>]

commit:     834e89227be486c6458aeb8c28423bbbb6fa3bd5
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 12 15:52:36 2012 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Mon Nov 12 15:52:36 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/mirrorselect.git;a=commit;h=834e8922

initial EPREFIX enabling. not fully tested.

---
 mirrorselect/main.py |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/mirrorselect/main.py b/mirrorselect/main.py
index 13c0a9f..528f383 100755
--- a/mirrorselect/main.py
+++ b/mirrorselect/main.py
@@ -47,6 +47,15 @@ from mirrorselect.selectors import Deep, Shallow, Extractor, Interactive
 from mirrorselect.version import version
 
 
+# establish the eprefix, initially set so eprefixify can
+# set it on install
+EPREFIX = "@GENTOO_PORTAGE_EPREFIX@"
+
+# check and set it if it wasn't
+if "GENTOO_PORTAGE_EPREFIX" in EPREFIX:
+    EPREFIX = ''
+
+
 class MirrorSelect(object):
 	'''Main operational class'''
 
@@ -352,11 +361,11 @@ class MirrorSelect(object):
 		@rtype: string
 		'''
 		# start with the new location
-		config_path = '/etc/portage/make.conf'
+		config_path = EPREFIX + '/etc/portage/make.conf'
 		if not os.access(config_path, os.F_OK):
 			# check if the old location is what is used
-			if os.access('/etc/make.conf', os.F_OK):
-				config_path = '/etc/make.conf'
+			if os.access(EPREFIX + '/etc/make.conf', os.F_OK):
+				config_path = EPREFIX + '/etc/make.conf'
 		return config_path