summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Stubbs <jstubbs@gentoo.org>2005-10-10 05:18:16 +0000
committerJason Stubbs <jstubbs@gentoo.org>2005-10-10 05:18:16 +0000
commit69272816683f3750525c50fba16ffe3b31393d66 (patch)
treeb09574b479e4d5904a9c99911b9392367573a2fc
parentcacheddir() would incorrectly return from the cache when the cached entry is ... (diff)
downloadportage-multirepo-69272816683f3750525c50fba16ffe3b31393d66.tar.gz
portage-multirepo-69272816683f3750525c50fba16ffe3b31393d66.tar.bz2
portage-multirepo-69272816683f3750525c50fba16ffe3b31393d66.zip
Global var profiledir was only being set correctly when portage was imported by emerge
svn path=/main/branches/2.0/; revision=2119
-rw-r--r--pym/portage.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/pym/portage.py b/pym/portage.py
index 74a37d16..9adef552 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()