From f5af1aa10837737c0d729ed79a695ab492efc74f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20G=C3=B3rny?= Date: Sun, 4 Jan 2015 22:18:12 +0000 Subject: [PATCH] Run pkg_setup() only in non-binary installs, as intended and documented a long time ago :). --- eclass/ChangeLog | 6 +++++- eclass/python-single-r1.eclass | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/eclass/ChangeLog b/eclass/ChangeLog index a44b5e990137..41d0f22b22f3 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1498 2015/01/04 21:16:47 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1499 2015/01/04 22:18:12 mgorny Exp $ + + 04 Jan 2015; Michał Górny python-single-r1.eclass: + Run pkg_setup() only in non-binary installs, as intended and documented a + long time ago :). 04 Jan 2015; Joerg Bornkessel vdr-plugin-2.eclass: documentation syntax fixed diff --git a/eclass/python-single-r1.eclass b/eclass/python-single-r1.eclass index ede5b5a5048b..6969fb1b203f 100644 --- a/eclass/python-single-r1.eclass +++ b/eclass/python-single-r1.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/python-single-r1.eclass,v 1.30 2014/12/28 22:50:20 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/python-single-r1.eclass,v 1.31 2015/01/04 22:18:12 mgorny Exp $ # @ECLASS: python-single-r1 # @MAINTAINER: @@ -441,7 +441,7 @@ python_setup() { python-single-r1_pkg_setup() { debug-print-function ${FUNCNAME} "${@}" - python_setup + [[ ${MERGE_TYPE} != binary ]] && python_setup } _PYTHON_SINGLE_R1=1 -- 2.26.2