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 406B71381F3 for ; Thu, 25 Jul 2013 19:55:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EFF41E09C3; Thu, 25 Jul 2013 19:55:17 +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 84326E09C3 for ; Thu, 25 Jul 2013 19:55:17 +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 4518D33E725 for ; Thu, 25 Jul 2013 19:55:16 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id C61CBE5458 for ; Thu, 25 Jul 2013 19:55:14 +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: <1374782089.73188d23c68989539a913716bb8a4132d2c43316.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/repository/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/repository/config.py X-VCS-Directories: pym/portage/repository/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 73188d23c68989539a913716bb8a4132d2c43316 X-VCS-Branch: master Date: Thu, 25 Jul 2013 19:55:14 +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: 87dd63f7-2e9f-4956-9598-64a0807e7a34 X-Archives-Hash: 534816fe6b303f4648e4015b6f158538 commit: 73188d23c68989539a913716bb8a4132d2c43316 Author: Zac Medico gentoo org> AuthorDate: Thu Jul 25 19:54:49 2013 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu Jul 25 19:54:49 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=73188d23 RepoConfig: backward compat SYNC for mirrorselect This restores SYNC support which was removed in commit 47e8d22dabf2197193c8f133698fb967afa560f4. --- pym/portage/repository/config.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pym/portage/repository/config.py b/pym/portage/repository/config.py index 919a9d6..57cc3a3 100644 --- a/pym/portage/repository/config.py +++ b/pym/portage/repository/config.py @@ -575,9 +575,11 @@ class RepoConfigLoader(object): if "PORTAGE_REPOSITORIES" in settings: portdir = "" portdir_overlay = "" + portdir_sync = "" else: portdir = settings.get("PORTDIR", "") portdir_overlay = settings.get("PORTDIR_OVERLAY", "") + portdir_sync = settings.get("SYNC", "") try: self._parse(paths, prepos, ignored_map, @@ -697,6 +699,12 @@ class RepoConfigLoader(object): # This happens if main-repo has been set in repos.conf. prepos[main_repo].priority = -1000 + # Backward compatible SYNC support for mirrorselect. + if portdir_sync and main_repo is not None: + if portdir_sync.startswith("rsync://"): + prepos[main_repo].sync_uri = portdir_sync + prepos[main_repo].sync_type = "rsync" + # Include repo.name in sort key, for predictable sorting # even when priorities are equal. prepos_order = sorted(prepos.items(),