From: Michał Górny <mgorny@gentoo.org>
Date: Fri, 8 Jun 2018 07:13:11 +0000 (+0200)
Subject: desktop.eclass: Sanitize insopts
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=49a3ae2282a321412ede225fcd0fcba415deb480;p=gentoo.git

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.
---

diff --git a/eclass/desktop.eclass b/eclass/desktop.eclass
index d65b0d0bf074..91521b85a821 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