| 1 |
commit: 9750e66503012fe7ca29b4a5c6447aae8b6c539c |
| 2 |
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org> |
| 3 |
AuthorDate: Mon Aug 28 06:01:48 2017 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Aug 28 06:19:53 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=9750e665 |
| 7 |
|
| 8 |
RepoConfigLoader: Fix compatibility with Python 3.7 (bug #629146). |
| 9 |
|
| 10 |
Set default value of sync-rsync-extra-opts to "" instead of None, which |
| 11 |
is no longer supported since: |
| 12 |
https://github.com/python/cpython/commit/44e6ad87340d50f48daf53b6a61138377d0d0d10 |
| 13 |
|
| 14 |
pym/portage/repository/config.py | 4 ++-- |
| 15 |
1 file changed, 2 insertions(+), 2 deletions(-) |
| 16 |
|
| 17 |
diff --git a/pym/portage/repository/config.py b/pym/portage/repository/config.py |
| 18 |
index b65ed97ce..902213014 100644 |
| 19 |
--- a/pym/portage/repository/config.py |
| 20 |
+++ b/pym/portage/repository/config.py |
| 21 |
@@ -1,4 +1,4 @@ |
| 22 |
-# Copyright 2010-2015 Gentoo Foundation |
| 23 |
+# Copyright 2010-2017 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
|
| 26 |
from __future__ import unicode_literals |
| 27 |
@@ -613,7 +613,7 @@ class RepoConfigLoader(object): |
| 28 |
portdir_sync = settings.get("SYNC", "") |
| 29 |
|
| 30 |
default_opts['sync-rsync-extra-opts'] = \ |
| 31 |
- settings.get("PORTAGE_RSYNC_EXTRA_OPTS", None) |
| 32 |
+ settings.get("PORTAGE_RSYNC_EXTRA_OPTS", "") |
| 33 |
|
| 34 |
try: |
| 35 |
self._parse(paths, prepos, settings.local_config, default_opts) |
Archives