From: Zac Medico Date: Fri, 22 Mar 2013 01:42:20 +0000 (-0700) Subject: portage.const: realpath(__file__.rstrip("co")) X-Git-Tag: v2.2.0_alpha169 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ebd93103ea9ad9a95147f21faca01c5d6478eab8;p=portage.git portage.const: realpath(__file__.rstrip("co")) With python2.x, __file__ may refer to the compiled bytcode file, but we want to follow the symlink of the uncompile py file. --- diff --git a/pym/portage/const.py b/pym/portage/const.py index 93556a02b..5e960d968 100644 --- a/pym/portage/const.py +++ b/pym/portage/const.py @@ -60,7 +60,7 @@ GLOBAL_CONFIG_PATH = "/usr/share/portage/config" # these variables are not used with target_root or config_root # NOTE: Use realpath(__file__) so that python module symlinks in site-packages # are followed back to the real location of the whole portage installation. -PORTAGE_BASE_PATH = os.path.join(os.sep, os.sep.join(os.path.realpath(__file__).split(os.sep)[:-3])) +PORTAGE_BASE_PATH = os.path.join(os.sep, os.sep.join(os.path.realpath(__file__.rstrip("co")).split(os.sep)[:-3])) PORTAGE_BIN_PATH = PORTAGE_BASE_PATH + "/bin" PORTAGE_PYM_PATH = PORTAGE_BASE_PATH + "/pym" LOCALE_DATA_PATH = PORTAGE_BASE_PATH + "/locale" # FIXME: not used