Revert -r11077:11080, lstrip doesn't take a string but chars. Need to fix it differe...

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

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 023aab401bf2ac51b7f0e394377b419e7dbf373c..6da2e7ffd0909769a815974a73a9d78819646880 100644 (file)
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -1133,7 +1133,7 @@ class config(object):
                                        raise portage.exception.DirectoryNotFound(var)
 
                        if config_root is None:
-                               config_root = EPREFIX + "/"
+                               config_root = "/"
 
                        config_root = normalize_path(os.path.abspath(
                                config_root)).rstrip(os.path.sep) + os.path.sep
@@ -1144,7 +1144,7 @@ class config(object):
 
                        if not config_profile_path:
                                config_profile_path = \
-                                       os.path.join(config_root, PROFILE_PATH.lstrip(EPREFIX + os.path.sep))
+                                       os.path.join(config_root, PROFILE_PATH.lstrip(os.path.sep))
                                if os.path.isdir(config_profile_path):
                                        self.profile_path = config_profile_path
                                else:
@@ -1161,7 +1161,7 @@ class config(object):
                        self.module_priority    = ["user","default"]
                        self.modules            = {}
                        self.modules["user"] = getconfig(
-                               os.path.join(config_root, MODULES_FILE_PATH.lstrip(EPREFIX + os.path.sep)))
+                               os.path.join(config_root, MODULES_FILE_PATH.lstrip(os.path.sep)))
                        if self.modules["user"] is None:
                                self.modules["user"] = {}
                        self.modules["default"] = {
@@ -1213,7 +1213,7 @@ class config(object):
                                        self.profiles = []
                        if local_config:
                                custom_prof = os.path.join(
-                                       config_root, CUSTOM_PROFILE_PATH.lstrip(EPREFIX + os.path.sep))
+                                       config_root, CUSTOM_PROFILE_PATH.lstrip(os.path.sep))
                                if os.path.exists(custom_prof):
                                        self.user_profile_dir = custom_prof
                                        self.profiles.append(custom_prof)
@@ -1281,7 +1281,7 @@ class config(object):
                        del rawpuseforce
 
                        make_conf = getconfig(
-                               os.path.join(config_root, MAKE_CONF_FILE.lstrip(EPREFIX + os.path.sep)),
+                               os.path.join(config_root, MAKE_CONF_FILE.lstrip(os.path.sep)),
                                tolerant=tolerant, allow_sourcing=True)
                        if make_conf is None:
                                make_conf = {}
@@ -1372,7 +1372,7 @@ class config(object):
                        self.configdict["defaults"]=self.configlist[-1]
 
                        self.mygcfg = getconfig(
-                               os.path.join(config_root, MAKE_CONF_FILE.lstrip(EPREFIX + os.path.sep)),
+                               os.path.join(config_root, MAKE_CONF_FILE.lstrip(os.path.sep)),
                                tolerant=tolerant, allow_sourcing=True, expand=expand_map)
                        if self.mygcfg is None:
                                self.mygcfg = {}
@@ -1429,7 +1429,7 @@ class config(object):
                        self._plicensedict = {}
                        self.punmaskdict = {}
                        abs_user_config = os.path.join(config_root,
-                               USER_CONFIG_PATH.lstrip(EPREFIX + os.path.sep))
+                               USER_CONFIG_PATH.lstrip(os.path.sep))
 
                        # locations for "categories" and "arch.list" files
                        locations = [os.path.join(self["PORTDIR"], "profiles")]
@@ -1777,7 +1777,7 @@ class config(object):
                                                noiselevel=-1)
 
                abs_profile_path = os.path.join(self["PORTAGE_CONFIGROOT"],
-                       PROFILE_PATH.lstrip(EPREFIX + os.path.sep))
+                       PROFILE_PATH.lstrip(os.path.sep))
                if not self.profile_path or (not os.path.islink(abs_profile_path) and \
                        not os.path.exists(os.path.join(abs_profile_path, "parent")) and \
                        os.path.exists(os.path.join(self["PORTDIR"], "profiles"))):
@@ -1787,7 +1787,7 @@ class config(object):
                        writemsg("!!! (You can safely ignore this message when syncing. It's harmless.)\n\n\n")
 
                abs_user_virtuals = os.path.join(self["PORTAGE_CONFIGROOT"],
-                       USER_VIRTUALS_FILE.lstrip(EPREFIX + os.path.sep))
+                       USER_VIRTUALS_FILE.lstrip(os.path.sep))
                if os.path.exists(abs_user_virtuals):
                        writemsg("\n!!! /etc/portage/virtuals is deprecated in favor of\n")
                        writemsg("!!! /etc/portage/profile/virtuals. Please move it to\n")
@@ -3343,7 +3343,7 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0, locks_in_subdir=".locks",
        check_config_instance(mysettings)
 
        custommirrors = grabdict(os.path.join(mysettings["PORTAGE_CONFIGROOT"],
-               CUSTOM_MIRRORS_FILE.lstrip(EPREFIX + os.path.sep)), recursive=1)
+               CUSTOM_MIRRORS_FILE.lstrip(os.path.sep)), recursive=1)
 
        mymirrors=[]
 
@@ -4666,7 +4666,7 @@ def doebuild_environment(myebuild, mydo, myroot, mysettings, debug, use_cache, m
        mysettings["T"] = os.path.join(mysettings["PORTAGE_BUILDDIR"], "temp")
 
        mysettings["PORTAGE_BASHRC"] = os.path.join(
-               mysettings["PORTAGE_CONFIGROOT"], EBUILD_SH_ENV_FILE.lstrip(EPREFIX + os.path.sep))
+               mysettings["PORTAGE_CONFIGROOT"], EBUILD_SH_ENV_FILE.lstrip(os.path.sep))
        mysettings["EBUILD_EXIT_STATUS_FILE"] = os.path.join(
                mysettings["PORTAGE_BUILDDIR"], ".exit_status")
 
@@ -6536,7 +6536,7 @@ def getmaskingreason(mycpv, metadata=None, settings=None, portdb=None, return_lo
                if os.path.isdir(profdir):
                        locations.append(profdir)
        locations.append(os.path.join(settings["PORTAGE_CONFIGROOT"],
-               USER_CONFIG_PATH.lstrip(EPREFIX + os.path.sep)))
+               USER_CONFIG_PATH.lstrip(os.path.sep)))
        locations.reverse()
        pmasklists = [(x, grablines(os.path.join(x, "package.mask"), recursive=1)) for x in locations]
 
@@ -7249,8 +7249,8 @@ def init_legacy_globals():
        os.umask(022)
 
        kwargs = {}
-       kwargs["config_root"] = os.environ.get("PORTAGE_CONFIGROOT", EPREFIX + "/")
-       kwargs["target_root"] = os.environ.get("ROOT", "/")
+       for k, envvar in (("config_root", "PORTAGE_CONFIGROOT"), ("target_root", "ROOT")):
+               kwargs[k] = os.environ.get(envvar, "/")
 
        global _initializing_globals
        _initializing_globals = True

diff --git a/pym/portage/sets/__init__.py b/pym/portage/sets/__init__.py
index e1ffcaedb23a6285e9d390ea9dfa9a0eba7ff005..d688164b58246c5ebde28f1000c37a9bfcaacecb 100644 (file)
--- a/pym/portage/sets/__init__.py
+++ b/pym/portage/sets/__init__.py
@@ -5,7 +5,7 @@
 import os
 from ConfigParser import SafeConfigParser, NoOptionError
 from portage import load_mod
-from portage.const import USER_CONFIG_PATH, GLOBAL_CONFIG_PATH, EPREFIX
+from portage.const import USER_CONFIG_PATH, GLOBAL_CONFIG_PATH
 
 SETPREFIX = "@"
 
@@ -116,7 +116,7 @@ def load_default_config(settings, trees):
        setconfigpaths.append(os.path.join(settings["PORTDIR"], "sets.conf"))
        setconfigpaths += [os.path.join(x, "sets.conf") for x in settings["PORTDIR_OVERLAY"].split()]
        setconfigpaths.append(os.path.join(settings["PORTAGE_CONFIGROOT"],
-               USER_CONFIG_PATH.lstrip(EPREFIX + os.path.sep), "sets.conf"))
+               USER_CONFIG_PATH.lstrip(os.path.sep), "sets.conf"))
        return SetConfig(setconfigpaths, settings, trees)
 
 # adhoc test code

diff --git a/pym/portage/sets/files.py b/pym/portage/sets/files.py
index 9507a1bf15abaffc3f86baafa571176c12fd19b5..e30785621343af96e55ff1f75d76e456df813a76 100644 (file)
--- a/pym/portage/sets/files.py
+++ b/pym/portage/sets/files.py
@@ -7,7 +7,7 @@ import re
 from itertools import chain
 
 from portage.util import grabfile, write_atomic, ensure_dirs
-from portage.const import PRIVATE_PATH, USER_CONFIG_PATH, EPREFIX
+from portage.const import PRIVATE_PATH, USER_CONFIG_PATH
 from portage.locks import lockfile, unlockfile
 from portage import portage_gid
 from portage.sets.base import PackageSet, EditablePackageSet
@@ -109,7 +109,7 @@ class StaticFileSet(EditablePackageSet):
        
        def multiBuilder(self, options, settings, trees):
                rValue = {}
-               directory = options.get("directory", os.path.join(settings["PORTAGE_CONFIGROOT"], USER_CONFIG_PATH.lstrip(EPREFIX + os.sep), "sets"))
+               directory = options.get("directory", os.path.join(settings["PORTAGE_CONFIGROOT"], USER_CONFIG_PATH.lstrip(os.sep), "sets"))
                name_pattern = options.get("name_pattern", "${name}")
                if not "$name" in name_pattern and not "${name}" in name_pattern:
                        raise SetConfigError("name_pattern doesn't include ${name} placeholder")
@@ -150,7 +150,7 @@ class ConfigFileSet(PackageSet):
        
        def multiBuilder(self, options, settings, trees):
                rValue = {}
-               directory = options.get("directory", os.path.join(settings["PORTAGE_CONFIGROOT"], USER_CONFIG_PATH.lstrip(EPREFIX + os.sep)))
+               directory = options.get("directory", os.path.join(settings["PORTAGE_CONFIGROOT"], USER_CONFIG_PATH.lstrip(os.sep)))
                name_pattern = options.get("name_pattern", "sets/package_$suffix")
                if not "$suffix" in name_pattern and not "${suffix}" in name_pattern:
                        raise SetConfigError("name_pattern doesn't include $suffix placeholder")