From c54a920d60415f19b3a42796193d87b6b21c84a1 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 12 Jul 2009 20:45:53 +0000 Subject: Remove leading slash from appropriate paths inside portage.const, so that lstrip(os.sep) is not needed for os.path.join() calls. Thanks to Fabian Groffen for this patch. svn path=/main/trunk/; revision=13821 --- pym/_emerge/actions.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'pym/_emerge') diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py index f7ec0a15b..0a48271c5 100644 --- a/pym/_emerge/actions.py +++ b/pym/_emerge/actions.py @@ -2203,12 +2203,13 @@ def action_sync(settings, trees, mtimedb, myopts, myaction): chk_updated_cfg_files("/", settings.get("CONFIG_PROTECT","").split()) if myaction != "metadata": - if os.access(portage.USER_CONFIG_PATH + "/bin/post_sync", os.X_OK): + postsync = os.path.join(settings["PORTAGE_CONFIGROOT"], + portage.USER_CONFIG_PATH, "bin", "post_sync") + if os.access(postsync, os.X_OK): retval = portage.process.spawn( - [os.path.join(portage.USER_CONFIG_PATH, "bin", "post_sync"), - dosyncuri], env=settings.environ()) + [postsync, dosyncuri], env=settings.environ()) if retval != os.EX_OK: - print red(" * ")+bold("spawn failed of "+ portage.USER_CONFIG_PATH + "/bin/post_sync") + print red(" * ") + bold("spawn failed of " + postsync) if(mybestpv != mypvs) and not "--quiet" in myopts: print -- cgit v1.2.3-1-g7c22