commit: 04b6d7c94e37cff191b343c83e352983ebe9faa6
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 23 14:05:06 2017 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu Feb 23 14:05:06 2017 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=04b6d7c9
Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix
.gitignore | 2 ++
.travis.yml | 1 +
bin/check-implicit-pointer-usage.py | 22 ++++++------
bin/dispatch-conf | 4 +--
bin/etc-update | 19 +++++++---
man/portage.5 | 7 ++--
pym/_emerge/actions.py | 13 +++++--
pym/_emerge/main.py | 4 +--
pym/portage/cvstree.py | 6 ++--
pym/portage/emaint/modules/sync/sync.py | 11 +++---
pym/portage/glsa.py | 4 +--
pym/portage/news.py | 4 +--
pym/portage/package/ebuild/fetch.py | 4 +--
pym/portage/repository/config.py | 16 ++++++---
pym/portage/sync/controller.py | 13 +++++--
pym/portage/sync/modules/git/__init__.py | 14 +++++---
pym/portage/sync/modules/git/git.py | 4 ++-
pym/portage/tests/{bin => sets}/__test__.py | 0
pym/portage/tests/{bin => sync}/__test__.py | 0
pym/portage/tests/sync/test_sync_local.py | 23 ++++++++++---
pym/portage/tests/util/test_getconfig.py | 4 +--
pym/portage/tests/util/test_varExpand.py | 4 +--
pym/portage/util/__init__.py | 4 +--
pym/portage/util/_async/PopenProcess.py | 9 ++++-
pym/portage/util/compression_probe.py | 5 ++-
pym/portage/util/lafilefixer.py | 8 ++---
pym/portage/xml/metadata.py | 4 +--
repoman/man/repoman.1 | 5 ++-
repoman/pym/repoman/modules/scan/ebuild/checks.py | 40 ++++++++--------------
repoman/pym/repoman/modules/scan/fetch/fetches.py | 3 ++
repoman/pym/repoman/modules/vcs/cvs/changes.py | 2 +-
repoman/pym/repoman/modules/vcs/cvs/status.py | 6 ++--
repoman/pym/repoman/modules/vcs/git/status.py | 15 ++++----
repoman/pym/repoman/modules/vcs/svn/changes.py | 2 +-
repoman/pym/repoman/qa_data.py | 3 ++
.../pym/repoman/tests/changelog}/__test__.py | 0
repoman/runtests | 1 +
runtests | 1 +
38 files changed, 179 insertions(+), 108 deletions(-)
diff --cc bin/dispatch-conf
index befc8dcec,099c37f57..dc7e182e6
--- a/bin/dispatch-conf
+++ b/bin/dispatch-conf
@@@ -1,5 -1,5 +1,5 @@@
-#!/usr/bin/python -bO
+#!@PREFIX_PORTAGE_PYTHON@ -bO
- # Copyright 1999-2016 Gentoo Foundation
+ # Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
#
