From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RC7zj-0000Fz-C7 for garchives@archives.gentoo.org; Fri, 07 Oct 2011 10:49:35 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 82FCD21C148; Fri, 7 Oct 2011 10:49:28 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 4A93621C148 for ; Fri, 7 Oct 2011 10:49:28 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BAC0C1B4040 for ; Fri, 7 Oct 2011 10:49:27 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2256) id 7C3742004B; Fri, 7 Oct 2011 10:49:26 +0000 (UTC) From: "Dirkjan Ochtman (djc)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, djc@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in eclass: python.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: python.eclass X-VCS-Directories: eclass X-VCS-Committer: djc X-VCS-Committer-Name: Dirkjan Ochtman Content-Type: text/plain; charset=utf8 Message-Id: <20111007104926.7C3742004B@flycatcher.gentoo.org> Date: Fri, 7 Oct 2011 10:49:26 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 6f7d4dcca6c2251df078b79870abe52a djc 11/10/07 10:49:26 Modified: python.eclass Log: Improve support for SELinux in python_merge_intermediate_installation_i= mages(). (Patch by Arfrever.) Revision Changes Path 1.134 eclass/python.eclass file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.ecla= ss?rev=3D1.134&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.ecla= ss?rev=3D1.134&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/python.ecla= ss?r1=3D1.133&r2=3D1.134 Index: python.eclass =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/eclass/python.eclass,v retrieving revision 1.133 retrieving revision 1.134 diff -u -r1.133 -r1.134 --- python.eclass 7 Oct 2011 10:48:24 -0000 1.133 +++ python.eclass 7 Oct 2011 10:49:26 -0000 1.134 @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.133 2011/10/= 07 10:48:24 djc Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.134 2011/10/= 07 10:49:26 djc Exp $ =20 # @ECLASS: python.eclass # @MAINTAINER: @@ -1573,7 +1573,7 @@ popd > /dev/null || die "popd failed" =20 if ROOT=3D"/" has_version sys-apps/coreutils; then - cp -fr --preserve=3Dall "${intermediate_installation_images_directory= }/${PYTHON_ABI}/"* "${D}" || die "Merging of intermediate installation im= age for Python ABI '${PYTHON_ABI} into installation image failed" + cp -fr --preserve=3Dall --no-preserve=3Dcontext "${intermediate_insta= llation_images_directory}/${PYTHON_ABI}/"* "${D}" || die "Merging of inte= rmediate installation image for Python ABI '${PYTHON_ABI} into installati= on image failed" else cp -fpr "${intermediate_installation_images_directory}/${PYTHON_ABI}/= "* "${D}" || die "Merging of intermediate installation image for Python A= BI '${PYTHON_ABI} into installation image failed" fi