diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-10-11 16:29:55 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-10-11 16:29:55 +0000 |
| commit | e1e23923af978d643b596a2d8acd45d997971312 (patch) | |
| tree | 67afeb59a6c9a167e8f963d643161bf0aa2bf054 | |
| parent | c79c017e09b4079c97242a9c62ce5c5b5c66dd44 (diff) | |
| download | portage-e1e23923af978d643b596a2d8acd45d997971312.tar.gz portage-e1e23923af978d643b596a2d8acd45d997971312.tar.bz2 portage-e1e23923af978d643b596a2d8acd45d997971312.zip | |
Strip the leading path separator from USER_CONFIG_PATH
so that os.path.join works correctly.
svn path=/main/trunk/; revision=8051
| -rw-r--r-- | pym/emerge/__init__.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pym/emerge/__init__.py b/pym/emerge/__init__.py index 596320a92..645f2834f 100644 --- a/pym/emerge/__init__.py +++ b/pym/emerge/__init__.py @@ -6592,7 +6592,8 @@ def emerge_main(): setconfigpaths = [os.path.join(GLOBAL_CONFIG_PATH, "sets.conf")] setconfigpaths.append(os.path.join(settings["PORTDIR"], "sets.conf")) setconfigpaths += [os.path.join(x, "sets.conf") for x in settings["PORDIR_OVERLAY"].split()] - setconfigpaths.append(os.path.join(os.sep, settings["PORTAGE_CONFIGROOT"], USER_CONFIG_PATH, "sets.conf")) + setconfigpaths.append(os.path.join(settings["PORTAGE_CONFIGROOT"], + USER_CONFIG_PATH.lstrip(os.path.sep), "sets.conf")) #setconfig = SetConfig(setconfigpaths, settings, trees[settings["ROOT"]]) setconfig = make_default_config(settings, trees[settings["ROOT"]]) del setconfigpaths |