From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D44A71396D0 for ; Mon, 28 Aug 2017 06:20:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 22036E0D14; Mon, 28 Aug 2017 06:20:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F1DDCE0D14 for ; Mon, 28 Aug 2017 06:20:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 32C3D3418B5 for ; Mon, 28 Aug 2017 06:20:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 454178545 for ; Mon, 28 Aug 2017 06:20:03 +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: <1503901193.9750e66503012fe7ca29b4a5c6447aae8b6c539c.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: 9750e66503012fe7ca29b4a5c6447aae8b6c539c X-VCS-Branch: master Date: Mon, 28 Aug 2017 06:20:03 +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: 08a3f9cf-b9aa-40b5-959b-ff2d855a650f X-Archives-Hash: 802a6e5adacdde1aa389ac5da07602d1 commit: 9750e66503012fe7ca29b4a5c6447aae8b6c539c Author: Arfrever Frehtes Taifersar Arahesis Apache Org> AuthorDate: Mon Aug 28 06:01:48 2017 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Aug 28 06:19:53 2017 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=9750e665 RepoConfigLoader: Fix compatibility with Python 3.7 (bug #629146). Set default value of sync-rsync-extra-opts to "" instead of None, which is no longer supported since: https://github.com/python/cpython/commit/44e6ad87340d50f48daf53b6a61138377d0d0d10 pym/portage/repository/config.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pym/portage/repository/config.py b/pym/portage/repository/config.py index b65ed97ce..902213014 100644 --- a/pym/portage/repository/config.py +++ b/pym/portage/repository/config.py @@ -1,4 +1,4 @@ -# Copyright 2010-2015 Gentoo Foundation +# Copyright 2010-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 from __future__ import unicode_literals @@ -613,7 +613,7 @@ class RepoConfigLoader(object): portdir_sync = settings.get("SYNC", "") default_opts['sync-rsync-extra-opts'] = \ - settings.get("PORTAGE_RSYNC_EXTRA_OPTS", None) + settings.get("PORTAGE_RSYNC_EXTRA_OPTS", "") try: self._parse(paths, prepos, settings.local_config, default_opts)