diff options
author | Ulrich Müller <ulm@gentoo.org> | 2015-02-20 10:22:42 +0000 |
---|---|---|
committer | Ulrich Müller <ulm@gentoo.org> | 2015-02-20 10:22:42 +0000 |
commit | 0205e0117fae8e337b1622cce1022d58adedec02 (patch) | |
tree | b3070c79028d4f5467b7a389c480dbde7ffc3ead /eclass | |
parent | x86 stable, bug #540532 (diff) | |
download | gentoo-2-0205e0117fae8e337b1622cce1022d58adedec02.tar.gz gentoo-2-0205e0117fae8e337b1622cce1022d58adedec02.tar.bz2 gentoo-2-0205e0117fae8e337b1622cce1022d58adedec02.zip |
[QA] games.eclass: Leave permissions of top-level directories alone, bug 537580.
Diffstat (limited to 'eclass')
-rw-r--r-- | eclass/ChangeLog | 5 | ||||
-rw-r--r-- | eclass/games.eclass | 13 |
2 files changed, 11 insertions, 7 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 7c6dad3254bc..dbaa91df4ce0 100644 --- 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 0b4ded7d8295..336698e805cf 100644 --- 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 |