From 726c05b479e6b90d9d6985e0a2c0e02c53da4b73 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Wed, 16 Jul 2008 11:52:52 +0000 Subject: [PATCH] more prefix confusement svn path=/main/branches/prefix/; revision=11079 --- pym/portage/sets/__init__.py | 4 ++-- pym/portage/sets/files.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pym/portage/sets/__init__.py b/pym/portage/sets/__init__.py index d688164b5..e1ffcaedb 100644 --- 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 +from portage.const import USER_CONFIG_PATH, GLOBAL_CONFIG_PATH, EPREFIX 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(os.path.sep), "sets.conf")) + USER_CONFIG_PATH.lstrip(EPREFIX + 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 e30785621..9507a1bf1 100644 --- 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 +from portage.const import PRIVATE_PATH, USER_CONFIG_PATH, EPREFIX 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(os.sep), "sets")) + directory = options.get("directory", os.path.join(settings["PORTAGE_CONFIGROOT"], USER_CONFIG_PATH.lstrip(EPREFIX + 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(os.sep))) + directory = options.get("directory", os.path.join(settings["PORTAGE_CONFIGROOT"], USER_CONFIG_PATH.lstrip(EPREFIX + 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") -- 2.26.2