From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 084F31381F3 for ; Fri, 26 Jul 2013 21:01:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C651CE0A10; Fri, 26 Jul 2013 21:01:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5E482E0A10 for ; Fri, 26 Jul 2013 21:01:43 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 76EEA33EA45 for ; Fri, 26 Jul 2013 21:01:42 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 0AB7EE468F for ; Fri, 26 Jul 2013 21:01:41 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1374872477.6bba024da3d349e0f73d0c5c8e802110c569eb7e.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/package/ebuild/config.py X-VCS-Directories: pym/portage/package/ebuild/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 6bba024da3d349e0f73d0c5c8e802110c569eb7e X-VCS-Branch: master Date: Fri, 26 Jul 2013 21:01:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 3a12482f-f842-42a0-8701-9d4695a7446f X-Archives-Hash: 6a27e5ef7de5b1de84ffc15b89c95c83 commit: 6bba024da3d349e0f73d0c5c8e802110c569eb7e Author: Zac Medico gentoo org> AuthorDate: Fri Jul 26 21:01:17 2013 +0000 Commit: Zac Medico gentoo org> CommitDate: Fri Jul 26 21:01:17 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=6bba024d Support SYNC setting in make.conf. This fixes commit 73188d23c68989539a913716bb8a4132d2c43316 so that it works with make.conf. --- pym/portage/package/ebuild/config.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py index 619d072..070a522 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)