[pyxdg] fix globbing issue where first mimetype is ignored for later matches
Tom Callaway
spot at fedoraproject.org
Tue Mar 5 15:20:05 UTC 2013
commit 08e69739fa6571a613cc1684ef7e1116636a1822
Author: Tom Callaway <spot at fedoraproject.org>
Date: Tue Mar 5 10:23:09 2013 -0500
fix globbing issue where first mimetype is ignored for later matches
pyxdg-0.25-find-first-mimetype-match.patch | 13 +++++++++++++
pyxdg.spec | 3 +++
2 files changed, 16 insertions(+), 0 deletions(-)
---
diff --git a/pyxdg-0.25-find-first-mimetype-match.patch b/pyxdg-0.25-find-first-mimetype-match.patch
new file mode 100644
index 0000000..b46f5ec
--- /dev/null
+++ b/pyxdg-0.25-find-first-mimetype-match.patch
@@ -0,0 +1,13 @@
+diff -up pyxdg-0.25/xdg/Mime.py.BAD pyxdg-0.25/xdg/Mime.py
+--- pyxdg-0.25/xdg/Mime.py.BAD 2013-03-05 10:19:10.750845664 -0500
++++ pyxdg-0.25/xdg/Mime.py 2013-03-05 10:19:14.771845520 -0500
+@@ -360,7 +360,8 @@ def _cache_database():
+ if pattern.startswith('*.'):
+ rest = pattern[2:]
+ if not ('*' in rest or '[' in rest or '?' in rest):
+- exts[rest] = mtype
++ if rest not in exts:
++ exts[rest] = mtype
+ continue
+ if '*' in pattern or '[' in pattern or '?' in pattern:
+ globs.append((pattern, mtype))
diff --git a/pyxdg.spec b/pyxdg.spec
index f1795cc..4c6bf5f 100644
--- a/pyxdg.spec
+++ b/pyxdg.spec
@@ -12,6 +12,8 @@ Group: Development/Libraries
License: LGPLv2
URL: http://freedesktop.org/Software/pyxdg
Source0: http://people.freedesktop.org/~takluyver/%{name}-%{version}.tar.gz
+# https://bugs.freedesktop.org/show_bug.cgi?id=61817
+Patch0: pyxdg-0.25-find-first-mimetype-match.patch
BuildArch: noarch
# These are needed for the nose tests.
BuildRequires: python-nose, hicolor-icon-theme
@@ -35,6 +37,7 @@ package contains a Python 3 version of PyXDG.
%prep
%setup -q
+%patch0 -p1 -b .pngfix
%if 0%{?with_python3}
rm -rf %{py3dir}
More information about the scm-commits
mailing list