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 8406A138359 for ; Sun, 16 Aug 2020 21:23:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AAABCE0828; Sun, 16 Aug 2020 21:23:01 +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 90B4CE0828 for ; Sun, 16 Aug 2020 21:23:01 +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 82EAC34F14B for ; Sun, 16 Aug 2020 21:23:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DDC8222B for ; Sun, 16 Aug 2020 21:22:58 +0000 (UTC) From: "Matthew Thode" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matthew Thode" Message-ID: <1597612974.61fd48425430a79fdd1ab4baf9aad7cc2526e64f.prometheanfire@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/ansible/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/ansible/ansible-2.10.0.ebuild X-VCS-Directories: app-admin/ansible/ X-VCS-Committer: prometheanfire X-VCS-Committer-Name: Matthew Thode X-VCS-Revision: 61fd48425430a79fdd1ab4baf9aad7cc2526e64f X-VCS-Branch: master Date: Sun, 16 Aug 2020 21:22:58 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: fbf65a15-0f56-4448-8209-dc2726b424dc X-Archives-Hash: 99916caaf3a86383910c0ac8aeb54ba8 commit: 61fd48425430a79fdd1ab4baf9aad7cc2526e64f Author: Matthew Thode gentoo org> AuthorDate: Sun Aug 16 21:22:36 2020 +0000 Commit: Matthew Thode gentoo org> CommitDate: Sun Aug 16 21:22:54 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61fd4842 app-admin/ansible: fix upgrading ansible from previous versions Closes: https://bugs.gentoo.org/737434 Package-Manager: Portage-3.0.2, Repoman-2.3.23 Signed-off-by: Matthew Thode gentoo.org> app-admin/ansible/ansible-2.10.0.ebuild | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app-admin/ansible/ansible-2.10.0.ebuild b/app-admin/ansible/ansible-2.10.0.ebuild index 98ae9f94b8a..79e643cf99f 100644 --- a/app-admin/ansible/ansible-2.10.0.ebuild +++ b/app-admin/ansible/ansible-2.10.0.ebuild @@ -49,6 +49,12 @@ DEPEND=" dev-vcs/git )" +python_compile() { + # disable version checks on upgrade + export ANSIBLE_SKIP_CONFLICT_CHECK=1 + distutils-r1_python_compile +} + python_compile_all() { if use doc; then cd docs/docsite || die