diff options
| author |   Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org> | 2017-08-28 08:01:48 +0200 |
|---|---|---|
| committer |   Zac Medico <zmedico@gentoo.org> | 2017-08-27 23:19:53 -0700 |
| commit | 9750e66503012fe7ca29b4a5c6447aae8b6c539c (patch) | |
| tree | f9d825a804e8b8ce67439ccc10cf8b00074eb888 | |
| parent | _collision_protect: report progress in work todo (diff) | |
| download | portage-9750e66503012fe7ca29b4a5c6447aae8b6c539c.tar.gz portage-9750e66503012fe7ca29b4a5c6447aae8b6c539c.tar.bz2 portage-9750e66503012fe7ca29b4a5c6447aae8b6c539c.zip | |
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
| -rw-r--r-- | pym/portage/repository/config.py | 4 |
1 files 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) |