summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-10-11 18:16:53 -0700
committerZac Medico <zmedico@gentoo.org>2010-10-11 18:16:53 -0700
commit66645836c289690d6f86efadfc224874d7352826 (patch)
tree033f7a29d11185aef819d7e50649d5eae1056ff5
parenthas/best_version: eqawarn if EAPI wrong for atom (diff)
downloadportage-66645836c289690d6f86efadfc224874d7352826.tar.gz
portage-66645836c289690d6f86efadfc224874d7352826.tar.bz2
portage-66645836c289690d6f86efadfc224874d7352826.zip
Use user_location for PORTDIR variable.
-rw-r--r--pym/portage/package/ebuild/config.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py
index 45eae7871..8330390e5 100644
--- a/pym/portage/package/ebuild/config.py
+++ b/pym/portage/package/ebuild/config.py
@@ -481,8 +481,11 @@ class config(object):
self.repositories = load_repository_config(self)
#filling PORTDIR and PORTDIR_OVERLAY variable for compatibility
- self["PORTDIR"] = self.repositories.mainRepoLocation()
- self.backup_changes("PORTDIR")
+ main_repo = self.repositories.mainRepo()
+ if main_repo is not None:
+ main_repo = main_repo.user_location
+ self["PORTDIR"] = main_repo
+ self.backup_changes("PORTDIR")
portdir_overlay = list(self.repositories.repoUserLocationList())
if self["PORTDIR"] in portdir_overlay:
portdir_overlay.remove(self["PORTDIR"])