| 1 |
commit: 49a3ae2282a321412ede225fcd0fcba415deb480 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jun 8 07:13:11 2018 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jun 13 08:09:56 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49a3ae22 |
| 7 |
|
| 8 |
desktop.eclass: Sanitize insopts |
| 9 |
|
| 10 |
Sanitize insopts when calling doins, in order to avoid prior insopts |
| 11 |
calls accidentally affecting do*/new* functions defined by the eclass. |
| 12 |
|
| 13 |
eclass/desktop.eclass | 5 +++++ |
| 14 |
1 file changed, 5 insertions(+) |
| 15 |
|
| 16 |
diff --git a/eclass/desktop.eclass b/eclass/desktop.eclass |
| 17 |
index d65b0d0bf07..91521b85a82 100644 |
| 18 |
--- a/eclass/desktop.eclass |
| 19 |
+++ b/eclass/desktop.eclass |
| 20 |
@@ -195,6 +195,7 @@ make_desktop_entry() { |
| 21 |
( |
| 22 |
# wrap the env here so that the 'insinto' call |
| 23 |
# doesn't corrupt the env of the caller |
| 24 |
+ insopts -m 0644 |
| 25 |
insinto /usr/share/applications |
| 26 |
doins "${desktop}" |
| 27 |
) || die "installing desktop file failed" |
| 28 |
@@ -228,6 +229,7 @@ make_session_desktop() { |
| 29 |
( |
| 30 |
# wrap the env here so that the 'insinto' call |
| 31 |
# doesn't corrupt the env of the caller |
| 32 |
+ insopts -m 0644 |
| 33 |
insinto /usr/share/xsessions |
| 34 |
doins "${desktop}" |
| 35 |
) |
| 36 |
@@ -243,6 +245,7 @@ domenu() { |
| 37 |
# wrap the env here so that the 'insinto' call |
| 38 |
# doesn't corrupt the env of the caller |
| 39 |
local i j ret=0 |
| 40 |
+ insopts -m 0644 |
| 41 |
insinto /usr/share/applications |
| 42 |
for i in "$@" ; do |
| 43 |
if [[ -f ${i} ]] ; then |
| 44 |
@@ -269,6 +272,7 @@ newmenu() { |
| 45 |
( |
| 46 |
# wrap the env here so that the 'insinto' call |
| 47 |
# doesn't corrupt the env of the caller |
| 48 |
+ insopts -m 0644 |
| 49 |
insinto /usr/share/applications |
| 50 |
newins "$@" |
| 51 |
) |
| 52 |
@@ -282,6 +286,7 @@ _iconins() { |
| 53 |
( |
| 54 |
# wrap the env here so that the 'insinto' call |
| 55 |
# doesn't corrupt the env of the caller |
| 56 |
+ insopts -m 0644 |
| 57 |
local funcname=$1; shift |
| 58 |
local size dir |
| 59 |
local context=apps |
Archives