[QA] games.eclass: Leave permissions of top-level directories alone, bug 537580.

diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index 7c6dad3254bc0caddea3c4ce3f089c4d5d0dd2f2..dbaa91df4ce0ab8c9c068ff4e35b8510f8a75052 100644 (file)
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -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.1542 2015/02/20 08:14:22 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1543 2015/02/20 10:22:42 ulm Exp $
+
+  20 Feb 2015; Ulrich Müller <ulm@gentoo.org> games.eclass:
+  [QA] Leave permissions of top-level directories alone, bug 537580.
 
   20 Feb 2015; Patrick Lauer <patrick@gentoo.org> python-r1.eclass,
   python-single-r1.eclass:

diff --git a/eclass/games.eclass b/eclass/games.eclass
index 0b4ded7d8295804fa16cfee4d0ee4d5fdb1f37b5..336698e805cf01798c81d0cc2e2108af24544549 100644 (file)
--- a/eclass/games.eclass
+++ b/eclass/games.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/games.eclass,v 1.159 2014/11/21 21:47:16 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/games.eclass,v 1.160 2015/02/20 10:22:42 ulm Exp $
 
 # @ECLASS: games
 # @MAINTAINER:
@@ -246,10 +246,11 @@ prepgamesdirs() {
                        [[ ${dir} = ${GAMES_STATEDIR} ]] && mode=o-rwx,g+r
                        find "${D}/${dir}" -type f -print0 | xargs -0 chmod $mode
 
-                       # common trees should not be games owned #264872
-                       if [[ ${dir} == "${GAMES_PREFIX_OPT}" ]] ; then
-                               fowners root:root "${dir}"
-                               fperms 755 "${dir}"
+                       # common trees should not be games owned #264872 #537580
+                       fowners root:root "${dir}"
+                       fperms 755 "${dir}"
+                       if [[ ${dir} == "${GAMES_PREFIX}" \
+                                               || ${dir} == "${GAMES_PREFIX_OPT}" ]] ; then
                                for d in $(get_libdir) bin ; do
                                        # check if dirs exist to avoid "nonfatal" option
                                        if [[ -e ${D}/${dir}/${d} ]] ; then