Relaxed path, first try.

svn path=/main/branches/prefix/; revision=2772

diff --git a/pym/portage.py b/pym/portage.py
index 108a950ab62a76e0ca9dfca2143717a7f7b959e8..3628e0a95db893ab4e9c72c26ce38abab056abb9 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -1092,6 +1092,10 @@ class config:
                        self.configlist.append({})
                        self.configdict["auto"]=self.configlist[-1]
 
+                       try:
+                               portage_const.DEFAULT_PATH=portage_const.DEFAULT_PATH+":"+self.mygcfg["ROOTPATH"]
+                       except KeyError:
+                               pass
                        #backup-env (for recording our calculated incremental variables:)
                        self.backupenv = os.environ.copy()
                        self.configlist.append(self.backupenv) # XXX Why though?

diff --git a/pym/portage_const.py b/pym/portage_const.py
index a3f2652f6bb44d517bf88181c66688c7e1f18d7b..290534c0909a4069fc8d81aad4987390745e791a 100644 (file)
--- a/pym/portage_const.py
+++ b/pym/portage_const.py
@@ -29,10 +29,10 @@ PORTAGE_PYM_PATH        = PORTAGE_BASE_PATH+"/pym"
 PROFILE_PATH            = PREFIX+"/etc/make.profile"
 LOCALE_DATA_PATH        = PORTAGE_BASE_PATH+"/locale"
 
-EBUILD_SH_BINARY        = PORTAGE_BIN_PATH+"/ebuild.sh"
+EBUILD_SH_BINARY        = "ebuild.sh"
 SANDBOX_BINARY          = PREFIX+"/usr/bin/sandbox"
-BASH_BINARY             = PREFIX+"/bin/bash"
-MOVE_BINARY             = PREFIX+"/bin/mv"
+BASH_BINARY             = "bash"
+MOVE_BINARY             = "mv"
 PRELINK_BINARY          = PREFIX+"/usr/sbin/prelink"
 
 WORLD_FILE              = PRIVATE_PATH+"/world"
@@ -48,7 +48,8 @@ CONFIG_MEMORY_FILE      = PRIVATE_PATH + "/config"
 INCREMENTALS=["USE","USE_EXPAND","USE_EXPAND_HIDDEN","FEATURES","ACCEPT_KEYWORDS","ACCEPT_LICENSE","CONFIG_PROTECT_MASK","CONFIG_PROTECT","PRELINK_PATH","PRELINK_PATH_MASK"]
 STICKIES=["KEYWORDS_ACCEPT","USE","CFLAGS","CXXFLAGS","MAKEOPTS","EXTRA_ECONF","EXTRA_EINSTALL","EXTRA_EMAKE"]
 EBUILD_PHASES                  = ["setup","unpack","compile","test","install","preinst","postinst","prerm","postrm"]
-DEFAULT_PATH = ":".join(map(lambda x: os.path.normpath(os.path.join(PREFIX, x)), ["/sbin", "/usr/sbin", "/bin", "/usr/bin"]))
+
+DEFAULT_PATH = ":".join(map(lambda x: os.path.normpath(os.path.join(PREFIX, x)), ["sbin", "usr/sbin", "bin", "usr/bin"]))
 
 EAPI = "prefix"