From c0cf80d166b1c5194e05331f664c158e02dd6513822352deed9d28a7303516fd Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Wed, 11 Oct 2017 07:00:12 +0000 Subject: [PATCH] Accepting request 532796 from home:sbrabec:branches:desktop-file-utils-1049867 - suse-update-mime-defaults: Do not be confused by "r" environment variable. Requires DESTDIR=/foo command line argument instead (boo#1049867). OBS-URL: https://build.opensuse.org/request/show/532796 OBS-URL: https://build.opensuse.org/package/show/X11:common:Factory/desktop-file-utils?expand=0&rev=62 --- desktop-file-utils.changes | 7 +++++++ suse-update-mime-defaults | 8 ++++++++ 2 files changed, 15 insertions(+) diff --git a/desktop-file-utils.changes b/desktop-file-utils.changes index 0748fca..d541ae3 100644 --- a/desktop-file-utils.changes +++ b/desktop-file-utils.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Oct 9 16:01:45 CEST 2017 - sbrabec@suse.com + +- suse-update-mime-defaults: Do not be confused by "r" environment + variable. Requires DESTDIR=/foo command line argument instead + (boo#1049867). + ------------------------------------------------------------------- Thu Jun 22 10:07:09 UTC 2017 - dimstar@opensuse.org diff --git a/suse-update-mime-defaults b/suse-update-mime-defaults index d4fc7eb..ed97ff0 100644 --- a/suse-update-mime-defaults +++ b/suse-update-mime-defaults @@ -18,6 +18,14 @@ export LC_ALL=C +r= +case $1 in +DESTDIR=* ) + r=`echo "$1" | sed s/^DESTDIR=//` + shift + ;; +esac + # reset XDG_DATA_DIRS so it can be trusted unset XDG_DATA_DIRS if [ "${PROFILEREAD}" != "true" ]; then