Attachment 104545 Details for Bug 60329 – Patch to fix the multiple desktop files report by xdg-mime

[patch] Patch to fix the multiple desktop files report by xdg-mime

0001-xdg-mime-do-not-report-multiple-desktop-files-BR6032.patch (text/plain), 1.58 KB, created by Lionel Orry on 2014-08-13 08:08:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lionel Orry

Created: 2014-08-13 08:08:21 UTC

Size: 1.58 KB

patch

obsolete

>From 6363f6ca0c57df248c33d001a9da7c9c29e31516 Mon Sep 17 00:00:00 2001
>From: Lionel Orry <lionel.orry@gmail.com>
>Date: Wed, 13 Aug 2014 09:56:25 +0200
>Subject: [PATCH] xdg-mime: do not report multiple desktop files (BR60329)
>
>since commit 050333e3, xdg-mime checks both defaults.list and
>mimeinfo.cache. When a result is present in both files, it returns both
>results separated by a space.
>
>When this is the case, the desktop file name is made of the duplicated
>filename and the following chain of executions does not work properly.
>
>This commit tries to select the first found line before extracting the
>desktop file name.
>
>Signed-off-by: Lionel Orry <lionel.orry@gmail.com>
>---
> scripts/xdg-mime.in | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/scripts/xdg-mime.in b/scripts/xdg-mime.in
>index 474dc5d..ab5705d 100644
>--- a/scripts/xdg-mime.in
>+++ b/scripts/xdg-mime.in
>@@ -379,7 +379,7 @@ defapp_generic()
>     for x in `echo "$xdg_system_dirs" | sed 's/:/ /g'`; do
>        for prefix in "$XDG_MENU_PREFIX" ""; do
>           DEBUG 2 "Checking $x/applications/${prefix}defaults.list and $x/applications/${prefix}mimeinfo.cache"
>-          trader_result=`grep "$MIME=" $x/applications/${prefix}defaults.list $x/applications/${prefix}mimeinfo.cache 2> /dev/null | cut -d '=' -f 2 | cut -d ';' -f 1`
>+          trader_result=`grep "$MIME=" $x/applications/${prefix}defaults.list $x/applications/${prefix}mimeinfo.cache 2> /dev/null | head -n 1 | cut -d '=' -f 2 | cut -d ';' -f 1`
>           if [ -n "$trader_result" ] ; then
>               echo $trader_result
>               exit_success
>-- 
>1.9.3
>

Actions: View | Splinter Review

Attachments on bug 60329: 104545

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.