diff options
author | Rex Dieter <rdieter@fedoraproject.org> | 2012-10-08 10:26:46 -0500 |
---|---|---|
committer | Rex Dieter <rdieter@fedoraproject.org> | 2012-10-08 10:26:46 -0500 |
commit | 050333e34e2fe7430ad2ead37e5a0420ac0c2a3e (patch) | |
tree | b2707cf40f9fe1fa1890130725953197d8719da7 | |
parent | 8f92ae1b0c1253727873394cacfb42ab5ef26e02 (diff) |
* xdg-mime does not search mimeinfo.cache (BR31629)
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | scripts/xdg-mime.in | 4 |
2 files changed, 5 insertions, 2 deletions
@@ -1,5 +1,8 @@ === xdg-utils 1.1.x === +2012-10-08 Rex Dieter <rdieter@fedoraproject.org> + * xdg-mime does not search mimeinfo.cache (BR31629) + 2012-09-16 Rex Dieter <rdieter@fedoraproject.org> * recognize XDG_CURRENT_DESKTOP/DESKTOP_SESSION=MATE (BR54941) * xdg-su: use gnomesu for mate (BR54941) diff --git a/scripts/xdg-mime.in b/scripts/xdg-mime.in index 2de4657..7669a3b 100644 --- a/scripts/xdg-mime.in +++ b/scripts/xdg-mime.in @@ -378,8 +378,8 @@ 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" - trader_result=`grep "$MIME=" $x/applications/${prefix}defaults.list 2> /dev/null | cut -d '=' -f 2 | cut -d ';' -f 1` + 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` if [ -n "$trader_result" ] ; then echo $trader_result exit_success |