raise TypeError, "Invalid type for config object: %s" % test.__class__
class config:
- def __init__(self, clone=None, mycpv=None, config_profile_path=None, config_incrementals=None):
+ def __init__(self, clone=None, mycpv=None, config_profile_path=None,
+ config_incrementals=None, config_root="/", target_root="/"):
self.already_in_regenerate = 0
self.uvlist = copy.deepcopy(clone.uvlist)
self.dirVirtuals = copy.deepcopy(clone.dirVirtuals)
self.treeVirtuals = copy.deepcopy(clone.treeVirtuals)
+ config_root = self.backupenv["PORTAGE_CONFIGROOT"]
+ target_root = self.backupenv["ROOT"]
else:
+
+ # backupenv is for calculated incremental variables.
+ self.backupenv = os.environ.copy()
+
+ config_root = config_root.rstrip(os.path.sep) + os.path.sep
+ target_root = target_root.rstrip(os.path.sep) + os.path.sep
+
+ for k, v in (("PORTAGE_CONFIGROOT", config_root),
+ ("ROOT", target_root)):
+ if not os.path.isdir(v):
+ writemsg("!!! Error: %s='%s' is not a directory. Please correct this.\n" % (k, v))
+ raise portage_exception.DirectoryNotFound(v)
+
+ self.backupenv["PORTAGE_CONFIGROOT"] = config_root
+ self.backupenv["ROOT"] = target_root
+
self.depcachedir = DEPCACHE_PATH
if not config_profile_path:
- writemsg("config_profile_path not specified to class config\n")
- if os.path.isdir(PROFILE_PATH):
- self.profile_path = PROFILE_PATH
+ config_profile_path = \
+ 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:
self.profile_path = None
else:
self.module_priority = ["user","default"]
self.modules = {}
- self.modules["user"] = getconfig(MODULES_FILE_PATH)
+ self.modules["user"] = getconfig(
+ os.path.join(config_root, MODULES_FILE_PATH.lstrip(os.path.sep)))
if self.modules["user"] is None:
self.modules["user"] = {}
self.modules["default"] = {
self.usemask=[]
self.configlist=[]
- self.backupenv={}
+
# back up our incremental variables:
self.configdict={}
# configlist will contain: [ globals, defaults, conf, pkg, auto, backupenv (incrementals), origenv ]
if os.environ.has_key("PORTAGE_CALLER") and os.environ["PORTAGE_CALLER"] == "repoman":
pass
else:
- # XXX: This should depend on ROOT?
- if os.path.exists("/"+CUSTOM_PROFILE_PATH):
- self.user_profile_dir = os.path.normpath("/"+"///"+CUSTOM_PROFILE_PATH)
- self.profiles.append(self.user_profile_dir[:])
+ custom_prof = os.path.join(
+ 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)
+ del custom_prof
self.packages_list = [grabfile_package(os.path.join(x, "packages")) for x in self.profiles]
self.packages = stack_lists(self.packages_list, incremental=1)
del use_defs_lists
try:
- mygcfg_dlists = [getconfig(os.path.join(x, "make.globals")) for x in self.profiles+["/etc"]]
+ mygcfg_dlists = [getconfig(os.path.join(x, "make.globals")) \
+ for x in self.profiles + [os.path.join(config_root, "etc")]]
self.mygcfg = stack_dicts(mygcfg_dlists, incrementals=portage_const.INCREMENTALS, ignore_none=1)
if self.mygcfg is None:
self.configdict["defaults"]=self.configlist[-1]
try:
- # XXX: Should depend on root?
- self.mygcfg=getconfig("/"+MAKE_CONF_FILE,allow_sourcing=True)
+ self.mygcfg = getconfig(
+ os.path.join(config_root, MAKE_CONF_FILE.lstrip(os.path.sep)),
+ allow_sourcing=True)
if self.mygcfg is None:
self.mygcfg = {}
except SystemExit, e:
self.configlist.append({})
self.configdict["auto"]=self.configlist[-1]
- #backup-env (for recording our calculated incremental variables:)
- self.backupenv = os.environ.copy()
self.configlist.append(self.backupenv) # XXX Why though?
self.configdict["backupenv"]=self.configlist[-1]
self.pkeywordsdict = {}
self.punmaskdict = {}
else:
- locations = [self["PORTDIR"] + "/profiles", USER_CONFIG_PATH]
+ abs_user_config = os.path.join(config_root,
+ USER_CONFIG_PATH.lstrip(os.path.sep))
+ locations = [os.path.join(self["PORTDIR"], "profiles"),
+ abs_user_config]
for ov in self["PORTDIR_OVERLAY"].split():
ov = os.path.normpath(ov)
if os.path.isdir(ov+"/profiles"):
locations.append(ov+"/profiles")
- pusedict=grabdict_package(USER_CONFIG_PATH+"/package.use", recursive=1)
+ pusedict = grabdict_package(
+ os.path.join(abs_user_config, "package.use"), recursive=1)
self.pusedict = {}
for key in pusedict.keys():
cp = dep_getkey(key)
self.pusedict[cp][key] = pusedict[key]
#package.keywords
- pkgdict=grabdict_package(USER_CONFIG_PATH+"/package.keywords", recursive=1)
+ pkgdict = grabdict_package(
+ os.path.join(abs_user_config, "package.keywords"),
+ recursive=1)
self.pkeywordsdict = {}
for key in pkgdict.keys():
# default to ~arch if no specific keyword is given
self.pkeywordsdict[cp][key] = pkgdict[key]
#package.unmask
- pkgunmasklines = grabfile_package(USER_CONFIG_PATH+"/package.unmask",recursive=1)
+ pkgunmasklines = grabfile_package(
+ os.path.join(abs_user_config, "package.unmask"),
+ recursive=1)
self.punmaskdict = {}
for x in pkgunmasklines:
mycatpkg=dep_getkey(x)
if mycpv:
self.setcpv(mycpv)
- myroot = self.get("ROOT", "/")
- myroot = myroot.rstrip(os.path.sep) + os.path.sep
- if not os.path.exists(myroot):
- writemsg("!!! Error: ROOT '%s' does not exist. Please correct this.\n" % myroot)
- raise portage_exception.DirectoryNotFound(myroot)
- elif not os.path.isdir(myroot):
- writemsg("!!! Error: ROOT '%s' is not a directory. Please correct this.\n" % myroot[:-1])
- raise portage_exception.DirectoryNotFound(myroot)
- self.backupenv["ROOT"] = myroot
self.backupenv["PORTAGE_BIN_PATH"] = PORTAGE_BIN_PATH
self.backupenv["PORTAGE_PYM_PATH"] = PORTAGE_PYM_PATH
if group not in archlist and group[0] != '-':
writemsg("!!! INVALID ACCEPT_KEYWORDS: %s\n" % str(group))
- if not os.path.islink(PROFILE_PATH) and \
+ abs_profile_path = os.path.join(self["PORTAGE_CONFIGROOT"],
+ PROFILE_PATH.lstrip(os.path.sep))
+ if not os.path.islink(abs_profile_path) and \
os.path.exists(os.path.join(self["PORTDIR"], "profiles")):
- writemsg("\a\n\n!!! %s is not a symlink and will probably prevent most merges.\n" % PROFILE_PATH)
+ writemsg("\a\n\n!!! %s is not a symlink and will probably prevent most merges.\n" % abs_profile_path)
writemsg("!!! It should point into a profile within %s/profiles/\n" % self["PORTDIR"])
writemsg("!!! (You can safely ignore this message when syncing. It's harmless.)\n\n\n")
- if os.path.exists(USER_VIRTUALS_FILE):
+ abs_user_virtuals = os.path.join(self["PORTAGE_CONFIGROOT"],
+ 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")
writemsg("!!! this new location.\n\n")
archlist, features, groups, pkglines, thirdpartymirrors, usedefaults, \
profiledir, flushmtimedb
+ kwargs = {}
+ for k, envvar in (("config_root", "PORTAGE_CONFIGROOT"), ("target_root", "ROOT")):
+ kwargs[k] = os.environ.get(envvar, "/")
+
try:
- settings = config(config_profile_path=PROFILE_PATH,
- config_incrementals=portage_const.INCREMENTALS)
+ settings = config(
+ config_incrementals=portage_const.INCREMENTALS, **kwargs)
+ del kwargs
except portage_exception.DirectoryNotFound, e:
writemsg("!!! Directory Not Found: %s\n" % str(e))
sys.exit(1)
projects / portage.git / commitdiff