mgorny      15/07/16 14:29:39

  Modified:             ChangeLog distutils-r1.eclass
  Log:
  Forbid also installing "examples" package, bug #555038.

Revision  Changes    Path
1.1712               eclass/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1712&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1712&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1711&r2=1.1712

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1711
retrieving revision 1.1712
diff -u -r1.1711 -r1.1712
--- ChangeLog   16 Jul 2015 06:06:59 -0000      1.1711
+++ ChangeLog   16 Jul 2015 14:29:39 -0000      1.1712
@@ -1,6 +1,9 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1711 2015/07/16 
06:06:59 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1712 2015/07/16 
14:29:39 mgorny Exp $
+
+  16 Jul 2015; Michał Górny <[email protected]> distutils-r1.eclass:
+  Forbid also installing "examples" package, bug #555038.
 
   16 Jul 2015; Lars Wendler <[email protected]> apache-2.eclass:
   Added slot dependency for openssl. Raised minimum required EAPI version to 5.



1.115                eclass/distutils-r1.eclass

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?rev=1.115&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?rev=1.115&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/distutils-r1.eclass?r1=1.114&r2=1.115

Index: distutils-r1.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- distutils-r1.eclass 4 Jul 2015 15:26:17 -0000       1.114
+++ distutils-r1.eclass 16 Jul 2015 14:29:39 -0000      1.115
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.114 
2015/07/04 15:26:17 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/distutils-r1.eclass,v 1.115 
2015/07/16 14:29:39 mgorny Exp $
 
 # @ECLASS: distutils-r1
 # @MAINTAINER:
@@ -549,9 +549,13 @@
 
        esetup.py install --root="${root}" "${args[@]}"
 
-       if [[ -d ${root}$(python_get_sitedir)/tests ]]; then
-               die "Package installs 'tests' package, file collisions likely."
-       fi
+       local forbidden_package_names=( examples test tests )
+       local p
+       for p in "${forbidden_package_names[@]}"; do
+               if [[ -d ${root}$(python_get_sitedir)/${p} ]]; then
+                       die "Package installs '${p}' package which is forbidden 
and likely a bug in the build system."
+               fi
+       done
        if [[ -d ${root}/usr/$(get_libdir)/pypy/share ]]; then
                eqawarn "Package installs 'share' in PyPy prefix, see bug 
#465546."
        fi




Reply via email to