Merge lp:~mvo/software-center/lp808455 into lp:software-center

[Michael Vogt]

Trivial fix for crash on downstream distros. Will do no harm and while looking at it I fixed another potential issue with the latest python-apt returning "None" for ver.uri

[Gary Lasker (gary-lasker)]

Looks good, thanks for fixing this one, Michael!

review: Approve

=== modified file 'apt-xapian-index-plugin/software-center.py'
--- apt-xapian-index-plugin/software-center.py	2012-02-09 19:32:19 +0000
+++ apt-xapian-index-plugin/software-center.py	2012-04-18 10:17:26 +0000
@@ -112,8 +112,13 @@
             # calculate the url and add it (but only if there actually is
             # a url)
             try:
-                url = get_distro().get_downloadable_icon_url(ver.uri, icon)
-                document.add_value(XapianValues.ICON_URL, url)
+                distro = get_distro()
+                if distro:
+                    base_uri = ver.uri
+                    # new python-apt returns None instead of StopIteration
+                    if base_uri:
+                        url = distro.get_downloadable_icon_url(base_uri, icon)
+                        document.add_value(XapianValues.ICON_URL, url)
             except StopIteration:
                 pass
         if CustomKeys.SCREENSHOT_URLS in ver.record: