From 424e924386098655e25267169dfa700b0e2823c3282bb93d39bb19f3ca51c6e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Thu, 20 Aug 2015 05:27:11 +0000 Subject: [PATCH] Accepting request 324417 from home:tiwai:branches:X11:Utilities - Fix the breakage of default IM selection due to the eval code for ~/.i18n in xim script (bsc#934720, boo#941052) OBS-URL: https://build.opensuse.org/request/show/324417 OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/x11-tools?expand=0&rev=37 --- x11-tools.changes | 6 ++++++ xim | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/x11-tools.changes b/x11-tools.changes index c5ad77e..daf077a 100644 --- a/x11-tools.changes +++ b/x11-tools.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Aug 19 20:00:24 CEST 2015 - tiwai@suse.de + +- Fix the breakage of default IM selection due to the eval code + for ~/.i18n in xim script (bsc#934720, boo#941052) + ------------------------------------------------------------------- Mon Aug 10 16:21:52 CEST 2015 - tiwai@suse.de diff --git a/xim b/xim index a458332..91a2045 100644 --- a/xim +++ b/xim @@ -70,7 +70,7 @@ adduserenv () { eval $(set +u +e . /etc/profile.d/lang.sh < /dev/null > /dev/null 2>&1 for cur in $var; do - echo export $cur=${!cur} + test -n "${!cur}" && echo export $cur=${!cur} done) return fi