From e1e23923af978d643b596a2d8acd45d997971312 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 11 Oct 2007 16:29:55 +0000 Subject: Strip the leading path separator from USER_CONFIG_PATH so that os.path.join works correctly. svn path=/main/trunk/; revision=8051 --- pym/emerge/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pym/emerge') 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 -- cgit v1.2.3-1-g7c22