Merge lp:~takluyver/ubuntu/raring/apt-xapian-index/catch-invalid-desktop-files into lp:ubuntu/raring/apt-xapian-index

[Thomas Kluyver]

An invalid app-install desktop entry file (see bug #1080669) was causing update-apt-xapian-index to fail. Previous versions of PyXDG had unintentionally masked the error. This catches the exception, and ignores the invalid .desktop file.

[Thomas Kluyver (takluyver)]

The patch has been accepted upstream

http://anonscm.debian.org/gitweb/?p=collab-maint/apt-xapian-index.git;a=commit;h=cefa7e5eed2ed0336aaf1fc183cc10faf119b5eb

[Sebastien Bacher (seb128)]

Thank you for your work, the buggy .desktop got fixed in raring meanwhile, it would still be good to get the patch included but could you update the merge request to include a changelog entry and a patch in debian/patches rather than a direct patch to the source?

review: Needs Fixing

[lp:~takluyver/ubuntu/raring/apt-xapian-index/catch-invalid-desktop-files]

34. By Thomas Kluyver on 2012-11-27

Catch error from invalid parsing file - move change to patch

[Thomas Kluyver (takluyver)]

Thanks, Sebastien. I've done as you suggest.

[Sebastien Bacher (seb128)]

Thanks, uploading to raring

review: Approve

[Thomas Kluyver (takluyver)]

Is it possible to deliver this as an SRU for Quantal as well? It's a pretty nasty regression that I keep getting 'System problem detected' notifications when update-apt-xapian-index runs.

[Sebastien Bacher (seb128)]

what do you mean? quantal doesn't have the pyxdg version that expose the issue...

[Thomas Kluyver (takluyver)]

Oops, you're right. I'd installed a newer version of python-xdg while working on packaging it. That's a relief - it's only myself and some very early upgraders that I caused problems for ;-)

=== modified file 'debian/changelog'
--- debian/changelog	2012-10-31 10:24:35 +0000
+++ debian/changelog	2012-11-27 17:40:25 +0000
@@ -1,3 +1,10 @@
+apt-xapian-index (0.44ubuntu9) UNRELEASED; urgency=low
+
+  * debian/patches/04_catch_invalid_desktop_file.patch: Catch an exception
+    from parsing invalid .desktop files for app-install.
+
+ -- Thomas Kluyver <[e-mail]>  Tue, 27 Nov 2012 17:06:09 +0000
+
 apt-xapian-index (0.44ubuntu8) raring; urgency=low
 
   * debian/patches/03_policykit_translations.patch: remove underscores from
 
=== added file 'debian/patches/04_catch_invalid_desktop_file.patch'
--- debian/patches/04_catch_invalid_desktop_file.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/04_catch_invalid_desktop_file.patch	2012-11-27 17:40:25 +0000
@@ -0,0 +1,29 @@
+PyXDG <= 0.19 had inadvertantly masked this error.
+
+Patch forwarded upstream.
+
+=== modified file 'plugins/app-install.py'
+--- old/plugins/app-install.py	2011-07-26 09:02:49 +0000
++++ new/plugins/app-install.py	2012-11-22 16:42:14 +0000
+@@ -1,5 +1,6 @@
+ try:
+     from xdg.DesktopEntry import DesktopEntry
++    from xdg.Exceptions import ParsingError
+     from xdg import Locale
+     HAS_XDG=True
+ except ImportError, e:
+@@ -142,7 +143,12 @@
+         progress.begin("Reading .desktop files from %s" % APPINSTALLDIR)
+         for f in os.listdir(APPINSTALLDIR):
+             if f[0] == '.' or not f.endswith(".desktop"): continue
+-            entry = DesktopEntry(os.path.join(APPINSTALLDIR, f))
++            try:
++                entry = DesktopEntry(os.path.join(APPINSTALLDIR, f))
++            except (ValueError, ParsingError):
++                # Invalid .desktop files can cause a ValueError. From PyXDG 0.25,
++                # that case will be turned into a ParsingError.
++                continue
+             pkg = entry.get("X-AppInstall-Package")
+             self.entries.setdefault(pkg, []).append((f, entry))
+         progress.end()
+
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2012-10-31 10:24:35 +0000
+++ debian/patches/series	2012-11-27 17:40:25 +0000
@@ -1,3 +1,4 @@
 01_axi_cjk_support.patch
 02_axi-pkgname-mangled-term.patch
 03_policykit_translations.patch
+04_catch_invalid_desktop_file.patch