summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2013-07-26 14:01:17 -0700
committerZac Medico <zmedico@gentoo.org>2013-07-26 14:01:17 -0700
commit6bba024da3d349e0f73d0c5c8e802110c569eb7e (patch)
tree953808f3d403958592b7076e08abc3cf5bf0bbf1
parentFix NameError. (diff)
downloadportage-6bba024da3d349e0f73d0c5c8e802110c569eb7e.tar.gz
portage-6bba024da3d349e0f73d0c5c8e802110c569eb7e.tar.bz2
portage-6bba024da3d349e0f73d0c5c8e802110c569eb7e.zip
Support SYNC setting in make.conf.v2.2.0_alpha190
This fixes commit 73188d23c68989539a913716bb8a4132d2c43316 so that it works with make.conf.
-rw-r--r--pym/portage/package/ebuild/config.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py
index 619d07240..070a522b9 100644
--- a/pym/portage/package/ebuild/config.py
+++ b/pym/portage/package/ebuild/config.py
@@ -491,6 +491,7 @@ class config(object):
known_repos = []
portdir = ""
portdir_overlay = ""
+ portdir_sync = None
for confs in [make_globals, make_conf, self.configdict["env"]]:
v = confs.get("PORTDIR")
if v is not None:
@@ -500,9 +501,15 @@ class config(object):
if v is not None:
portdir_overlay = v
known_repos.extend(shlex_split(v))
+ v = confs.get("SYNC")
+ if v is not None:
+ portdir_sync = v
+
known_repos = frozenset(known_repos)
self["PORTDIR"] = portdir
self["PORTDIR_OVERLAY"] = portdir_overlay
+ if portdir_sync:
+ self["SYNC"] = portdir_sync
self.lookuplist = [self.configdict["env"]]
if repositories is None:
self.repositories = load_repository_config(self)