From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 401F61381F3 for ; Sun, 25 Aug 2013 21:12:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 12505E0C21; Sun, 25 Aug 2013 21:12:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8C324E0C21 for ; Sun, 25 Aug 2013 21:12:39 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 74F6333EE30 for ; Sun, 25 Aug 2013 21:12:38 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2279) id 0C7AD2004C; Sun, 25 Aug 2013 21:12:36 +0000 (UTC) From: "Michal Gorny (mgorny)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, mgorny@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog distutils-r1.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog distutils-r1.eclass X-VCS-Directories: eclass X-VCS-Committer: mgorny X-VCS-Committer-Name: Michal Gorny Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20130825211237.0C7AD2004C@flycatcher.gentoo.org> Date: Sun, 25 Aug 2013 21:12:36 +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-Archives-Salt: 20513bd0-2996-473e-af6d-359fd7cf2392 X-Archives-Hash: 9e850d8a21aeee8b1667873b3b60693f mgorny 13/08/25 21:12:36 Modified: ChangeLog distutils-r1.eclass Log: Namespace, clean up and describe _disable_ez_setup. Revision Changes Path 1.934 eclass/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.934&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.934&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.933&r2=1.934 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v retrieving revision 1.933 retrieving revision 1.934 diff -u -r1.933 -r1.934 --- ChangeLog 25 Aug 2013 18:12:24 -0000 1.933 +++ ChangeLog 25 Aug 2013 21:12:36 -0000 1.934 @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.933 2013/08/25 18:12:24 eva Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.934 2013/08/25 21:12:36 mgorny Exp $ + + 25 Aug 2013; Michał Górny distutils-r1.eclass: + Namespace, clean up and describe _disable_ez_setup. 25 Aug 2013; Gilles Dartiguelongue gnome-games.eclass: Fix indentation and trailing whitespaces. 1.75 eclass/distutils-r1.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?rev=1.75&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?rev=1.75&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?r1=1.74&r2=1.75 Index: distutils-r1.eclass =================================================================== RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- distutils-r1.eclass 1 Aug 2013 13:02:32 -0000 1.74 +++ distutils-r1.eclass 25 Aug 2013 21:12:36 -0000 1.75 @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.74 2013/08/01 13:02:32 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.75 2013/08/25 21:12:36 mgorny Exp $ # @ECLASS: distutils-r1 # @MAINTAINER: @@ -308,10 +308,19 @@ esetup.py "${add_args[@]}" } -_disable_ez_setup() { +# @FUNCTION: _distutils-r1_disable_ez_setup +# @INTERNAL +# @DESCRIPTION: +# Stub out ez_setup.py and distribute_setup.py to prevent packages +# from trying to download a local copy of setuptools. +_distutils-r1_disable_ez_setup() { local stub="def use_setuptools(*args, **kwargs): pass" - [[ -f ez_setup.py ]] && echo "${stub}" > ez_setup.py - [[ -f distribute_setup.py ]] && echo "${stub}" > distribute_setup.py + if [[ -f ez_setup.py ]]; then + echo "${stub}" > ez_setup.py || die + fi + if [[ -f distribute_setup.py ]]; then + echo "${stub}" > distribute_setup.py || die + fi } # @FUNCTION: distutils-r1_python_prepare_all @@ -336,8 +345,7 @@ fi fi - # Prevent packages from downloading their own copy of setuptools - _disable_ez_setup + _distutils-r1_disable_ez_setup if [[ ${DISTUTILS_IN_SOURCE_BUILD} && ! ${DISTUTILS_SINGLE_IMPL} ]] then