| 1 |
Sanitize insopts when calling doins, in order to avoid prior insopts |
| 2 |
calls accidentally affecting do*/new* functions defined by the eclass. |
| 3 |
--- |
| 4 |
eclass/desktop.eclass | 5 +++++ |
| 5 |
1 file changed, 5 insertions(+) |
| 6 |
|
| 7 |
diff --git a/eclass/desktop.eclass b/eclass/desktop.eclass |
| 8 |
index d65b0d0bf074..7889b6fe87a9 100644 |
| 9 |
--- a/eclass/desktop.eclass |
| 10 |
+++ b/eclass/desktop.eclass |
| 11 |
@@ -195,6 +195,7 @@ make_desktop_entry() { |
| 12 |
( |
| 13 |
# wrap the env here so that the 'insinto' call |
| 14 |
# doesn't corrupt the env of the caller |
| 15 |
+ insopts |
| 16 |
insinto /usr/share/applications |
| 17 |
doins "${desktop}" |
| 18 |
) || die "installing desktop file failed" |
| 19 |
@@ -228,6 +229,7 @@ make_session_desktop() { |
| 20 |
( |
| 21 |
# wrap the env here so that the 'insinto' call |
| 22 |
# doesn't corrupt the env of the caller |
| 23 |
+ insopts |
| 24 |
insinto /usr/share/xsessions |
| 25 |
doins "${desktop}" |
| 26 |
) |
| 27 |
@@ -243,6 +245,7 @@ domenu() { |
| 28 |
# wrap the env here so that the 'insinto' call |
| 29 |
# doesn't corrupt the env of the caller |
| 30 |
local i j ret=0 |
| 31 |
+ insopts |
| 32 |
insinto /usr/share/applications |
| 33 |
for i in "$@" ; do |
| 34 |
if [[ -f ${i} ]] ; then |
| 35 |
@@ -269,6 +272,7 @@ newmenu() { |
| 36 |
( |
| 37 |
# wrap the env here so that the 'insinto' call |
| 38 |
# doesn't corrupt the env of the caller |
| 39 |
+ insopts |
| 40 |
insinto /usr/share/applications |
| 41 |
newins "$@" |
| 42 |
) |
| 43 |
@@ -282,6 +286,7 @@ _iconins() { |
| 44 |
( |
| 45 |
# wrap the env here so that the 'insinto' call |
| 46 |
# doesn't corrupt the env of the caller |
| 47 |
+ insopts |
| 48 |
local funcname=$1; shift |
| 49 |
local size dir |
| 50 |
local context=apps |
| 51 |
-- |
| 52 |
2.18.0.rc1 |
Archives