From: Jason Stubbs Date: Mon, 10 Oct 2005 05:18:16 +0000 (-0000) Subject: Global var profiledir was only being set correctly when portage was imported by emerge X-Git-Tag: v2.0.53_rc5~1 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=69272816683f3750525c50fba16ffe3b31393d66;p=portage.git Global var profiledir was only being set correctly when portage was imported by emerge svn path=/main/branches/2.0/; revision=2119 --- diff --git a/pym/portage.py b/pym/portage.py index 74a37d161..9adef5521 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -7148,9 +7148,9 @@ if not os.path.exists(root+"var/lib/portage"): os.umask(022) profiledir=None -if "PORTAGE_CALLER" in os.environ and os.environ["PORTAGE_CALLER"] == "emerge" and os.path.isdir(PROFILE_PATH): +if os.path.isdir(PROFILE_PATH): profiledir = PROFILE_PATH - if os.access(DEPRECATED_PROFILE_FILE, os.R_OK): + if "PORTAGE_CALLER" in os.environ and os.environ["PORTAGE_CALLER"] == "emerge" and os.access(DEPRECATED_PROFILE_FILE, os.R_OK): deprecatedfile = open(DEPRECATED_PROFILE_FILE, "r") dcontent = deprecatedfile.readlines() deprecatedfile.close()