commit:     83d49e592f23319504abd28c5a2e52e7bb14a3d2
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  4 10:47:56 2021 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Jan  4 10:48:37 2021 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=83d49e59

Merge remote-tracking branch 'origin/master' into prefix

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 .github/workflows/ci.yml                     |  43 +++++++
 .travis.yml                                  |  40 ------
 bin/misc-functions.sh                        |   2 +-
 lib/portage/__init__.py                      |   3 +-
 lib/portage/tests/util/futures/test_retry.py | 181 ++++++++++++++++-----------
 lib/portage/util/__init__.py                 |   9 +-
 lib/portage/util/env_update.py               |  30 ++---
 lib/portage/util/futures/retry.py            |   4 +-
 repoman/runtests                             |   5 +-
 runtests                                     |   5 +-
 src/portage_util_file_copy_reflink_linux.c   |  10 +-
 src/portage_util_libc.c                      |  10 +-
 tox.ini                                      |  15 ++-
 13 files changed, 194 insertions(+), 163 deletions(-)

Reply via email to