[gentoo-commits] repo/gentoo:master commit in: eclass/

[Michał Górny]

commit:     49a3ae2282a321412ede225fcd0fcba415deb480
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  8 07:13:11 2018 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jun 13 08:09:56 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49a3ae22

desktop.eclass: Sanitize insopts

Sanitize insopts when calling doins, in order to avoid prior insopts
calls accidentally affecting do*/new* functions defined by the eclass.

 eclass/desktop.eclass | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/eclass/desktop.eclass b/eclass/desktop.eclass
index d65b0d0bf07..91521b85a82 100644
--- a/eclass/desktop.eclass
+++ b/eclass/desktop.eclass
@@ -195,6 +195,7 @@ make_desktop_entry() {
        (
                # wrap the env here so that the 'insinto' call
                # doesn't corrupt the env of the caller
+               insopts -m 0644
                insinto /usr/share/applications
                doins "${desktop}"
        ) || die "installing desktop file failed"
@@ -228,6 +229,7 @@ make_session_desktop() {
        (
        # wrap the env here so that the 'insinto' call
        # doesn't corrupt the env of the caller
+       insopts -m 0644
        insinto /usr/share/xsessions
        doins "${desktop}"
        )
@@ -243,6 +245,7 @@ domenu() {
        # wrap the env here so that the 'insinto' call
        # doesn't corrupt the env of the caller
        local i j ret=0
+       insopts -m 0644
        insinto /usr/share/applications
        for i in "$@" ; do
                if [[ -f ${i} ]] ; then
@@ -269,6 +272,7 @@ newmenu() {
        (
        # wrap the env here so that the 'insinto' call
        # doesn't corrupt the env of the caller
+       insopts -m 0644
        insinto /usr/share/applications
        newins "$@"
        )
@@ -282,6 +286,7 @@ _iconins() {
        (
        # wrap the env here so that the 'insinto' call
        # doesn't corrupt the env of the caller
+       insopts -m 0644
        local funcname=$1; shift
        local size dir
        local context=apps