Merge lp:~michael.nelson/software-center/833982-previous-purchase-no-feedback-really-this-time into lp:software-center

[Michael Nelson]

Overview
========
This branch implements the backend for bug 833982 so that a purchased application that is unsupported on the current system will have a package state of:

PURCHASED_BUT_NOT_AVAILABLE_FOR_SERIES

rather than

PURCHASED_BUT_REPO_MUST_BE_ENABLED

Details
=======
There were a few things I was unsure about, so please check... specifically, the way I've defined a new sca desktop entry (why is it a desktop entry even though it's not related to a desktop file?)

Most of the change is tests and refactoring to make testing easier - for testing package states (specifically, being able to create a xapian doc for an app, without having to index it in the db... I don't yet understand why the db is even necessary for this point, still learning lots).

=== modified file 'softwarecenter/db/application.py'
--- softwarecenter/db/application.py	2011-12-16 01:52:15 +0000
+++ softwarecenter/db/application.py	2012-01-19 14:07:24 +0000
@@ -18,6 +18,7 @@
 
 from gi.repository import GObject, Gio
 
+import json
 import locale
 import logging
 import os
@@ -457,7 +458,23 @@
                     return PkgStates.NEEDS_PURCHASE
                 if (self.purchase_date and
                     self._doc.get_value(XapianValues.ARCHIVE_DEB_LINE)):
-                    return PkgStates.PURCHASED_BUT_REPO_MUST_BE_ENABLED
+                    supported_distros = self.supported_distros
+
+                    # Until bug 917109 is fixed on the server we won't have
+                    # any supported_distros for a for-purchase app, so we
+                    # follow the current behaviour in this case.
+                    if not supported_distros:
+                        return PkgStates.PURCHASED_BUT_REPO_MUST_BE_ENABLED
+
+                    current_distro = self._distro.get_codename()
+                    current_arch = self._distro.get_architecture()
+                    if current_distro in supported_distros and (
+                        current_arch in supported_distros[current_distro] or
+                        'any' in supported_distros[current_distro]):
+                        return PkgStates.PURCHASED_BUT_REPO_MUST_BE_ENABLED
+                    else:
+                        return PkgStates.PURCHASED_BUT_NOT_AVAILABLE_FOR_SERIES
+
                 if self.component:
                     components = self.component.split('&')
                     for component in components:
@@ -474,6 +491,15 @@
             return self._doc.get_value(XapianValues.PRICE)
 
     @property
+    def supported_distros(self):
+        if self._doc:
+            supported_series = self._doc.get_value(XapianValues.SC_SUPPORTED_DISTROS)
+            if not supported_series:
+                return {}
+
+            return json.loads(supported_series)
+
+    @property
     def ppaname(self):
         if self._doc:
             return self._doc.get_value(XapianValues.ARCHIVE_PPA)

=== modified file 'softwarecenter/db/update.py'
--- softwarecenter/db/update.py	2012-01-18 09:38:45 +0000
+++ softwarecenter/db/update.py	2012-01-19 14:07:24 +0000
@@ -152,6 +152,7 @@
                 'Support-Url'   : 'support_url',
                 'Description' : 'Description',
                 'Comment' : 'Comment',
+                'Supported-Distros': 'series',
               }
 
     # map from requested key to a static data element
@@ -617,7 +618,208 @@
     # return true if we have updated entries (this can also be an empty list)
     # but only if we did not got a error from the agent
     return sca.good_data
-        
+
+
+def make_doc_from_parser(parser, cache):
+    # XXX 2012-01-19 michaeln I'm just pulling this code out from
+    # index_app_info_from_parser, but it'd be great to further
+    # refactor it - it looks quite scary :-)
+    doc = xapian.Document()
+    # app name is the data
+    if parser.has_option_desktop("X-Ubuntu-Software-Center-Name"):
+        name = parser.get_desktop("X-Ubuntu-Software-Center-Name")
+        untranslated_name = parser.get_desktop("X-Ubuntu-Software-Center-Name", translated=False)
+    elif parser.has_option_desktop("X-GNOME-FullName"):
+        name = parser.get_desktop("X-GNOME-FullName")
+        untranslated_name = parser.get_desktop("X-GNOME-FullName", translated=False)
+    else:
+        name = parser.get_desktop("Name")
+        untranslated_name = parser.get_desktop("Name", translated=False)
+    doc.set_data(name)
+    doc.add_value(XapianValues.APPNAME_UNTRANSLATED, untranslated_name)
+
+    # check if we should ignore this file
+    if parser.has_option_desktop("X-AppInstall-Ignore"):
+        ignore = parser.get_desktop("X-AppInstall-Ignore")
+        if ignore.strip().lower() == "true":
+            LOG.debug("X-AppInstall-Ignore found for '%s'" % parser.desktopf)
+            return
+    # architecture
+    pkgname_extension = ''
+    if parser.has_option_desktop("X-AppInstall-Architectures"):
+        arches = parser.get_desktop("X-AppInstall-Architectures")
+        doc.add_value(XapianValues.ARCHIVE_ARCH, arches)
+        native_archs = get_current_arch() in arches.split(',')
+        foreign_archs = list(set(arches.split(',')) & set(get_foreign_architectures()))
+        if not (native_archs or foreign_archs): return
+        if not native_archs and foreign_archs:
+            pkgname_extension = ':' + foreign_archs[0]
+    # package name
+    pkgname = parser.get_desktop("X-AppInstall-Package") + pkgname_extension
+    doc.add_term("AP"+pkgname)
+    if '-' in pkgname:
+        # we need this to work around xapian oddness
+        doc.add_term(pkgname.replace('-','_'))
+    doc.add_value(XapianValues.PKGNAME, pkgname)
+    doc.add_value(XapianValues.DESKTOP_FILE, parser.desktopf)
+    # display name
+    if "display_name" in axi_values:
+        doc.add_value(axi_values["display_name"], name)
+    # cataloged_times
+    if "catalogedtime" in axi_values:
+        if pkgname in cataloged_times:
+            doc.add_value(axi_values["catalogedtime"], 
+                          xapian.sortable_serialise(cataloged_times[pkgname]))
+    # pocket (main, restricted, ...)
+    if parser.has_option_desktop("X-AppInstall-Section"):
+        archive_section = parser.get_desktop("X-AppInstall-Section")
+        doc.add_term("AS"+archive_section)
+        doc.add_value(XapianValues.ARCHIVE_SECTION, archive_section)
+    # section (mail, base, ..)
+    if pkgname in cache and cache[pkgname].candidate:
+        section = cache[pkgname].section
+        doc.add_term("AE"+section)
+    # channel (third party stuff)
+    if parser.has_option_desktop("X-AppInstall-Channel"):
+        archive_channel = parser.get_desktop("X-AppInstall-Channel")
+        doc.add_term("AH"+archive_channel)
+        doc.add_value(XapianValues.ARCHIVE_CHANNEL, archive_channel)
+    # signing key (third party)
+    if parser.has_option_desktop("X-AppInstall-Signing-Key-Id"):
+        keyid = parser.get_desktop("X-AppInstall-Signing-Key-Id")
+        doc.add_value(XapianValues.ARCHIVE_SIGNING_KEY_ID, keyid)
+    # license (third party)
+    if parser.has_option_desktop("X-AppInstall-License"):
+        license = parser.get_desktop("X-AppInstall-License")
+        doc.add_value(XapianValues.LICENSE, license)
+    # date published
+    if parser.has_option_desktop("X-AppInstall-Date-Published"):
+        date_published = parser.get_desktop("X-AppInstall-Date-Published")
+        if date_published:
+            # strip the subseconds from the end of the published date string
+            date_published = str(date_published).split(".")[0]
+            doc.add_value(XapianValues.DATE_PUBLISHED,
+                          date_published)
+            # we use the date published value for the cataloged time as well
+            if "catalogedtime" in axi_values:
+                LOG.debug(
+                        ("pkgname: %s, date_published cataloged time is: %s" %
+                             (pkgname, parser.get_desktop("date_published"))))
+                date_published_sec = time.mktime(
+                                        time.strptime(date_published,
+                                                      "%Y-%m-%d  %H:%M:%S"))
+                doc.add_value(axi_values["catalogedtime"], 
+                              xapian.sortable_serialise(date_published_sec))
+    # purchased date
+    if parser.has_option_desktop("X-AppInstall-Purchased-Date"):
+        date = parser.get_desktop("X-AppInstall-Purchased-Date")
+        # strip the subseconds from the end of the date string
+        doc.add_value(XapianValues.PURCHASED_DATE, str(date).split(".")[0])
+    # deb-line (third party)
+    if parser.has_option_desktop("X-AppInstall-Deb-Line"):
+        debline = parser.get_desktop("X-AppInstall-Deb-Line")
+        doc.add_value(XapianValues.ARCHIVE_DEB_LINE, debline)
+    # license key (third party)
+    if parser.has_option_desktop("X-AppInstall-License-Key"):
+        key = parser.get_desktop("X-AppInstall-License-Key")
+        doc.add_value(XapianValues.LICENSE_KEY, key)
+    # license keypath (third party)
+    if parser.has_option_desktop("X-AppInstall-License-Key-Path"):
+        path = parser.get_desktop("X-AppInstall-License-Key-Path")
+        doc.add_value(XapianValues.LICENSE_KEY_PATH, path)
+    # PPA (third party stuff)
+    if parser.has_option_desktop("X-AppInstall-PPA"):
+        archive_ppa = parser.get_desktop("X-AppInstall-PPA")
+        doc.add_value(XapianValues.ARCHIVE_PPA, archive_ppa)
+        # add archive origin data here so that its available even if
+        # the PPA is not (yet) enabled
+        doc.add_term("XOO"+"lp-ppa-%s" % archive_ppa.replace("/", "-"))
+    # screenshot (for third party)
+    if parser.has_option_desktop("X-AppInstall-Screenshot-Url"):
+        url = parser.get_desktop("X-AppInstall-Screenshot-Url")
+        doc.add_value(XapianValues.SCREENSHOT_URL, url)
+    # thumbnail (for third party)
+    if parser.has_option_desktop("X-AppInstall-Thumbnail-Url"):
+        url = parser.get_desktop("X-AppInstall-Thumbnail-Url")
+        doc.add_value(XapianValues.THUMBNAIL_URL, url)
+    # video support (for third party mostly)
+    if parser.has_option_desktop("X-AppInstall-Video-Url"):
+        url = parser.get_desktop("X-AppInstall-Video-Url")
+        doc.add_value(XapianValues.VIDEO_URL, url)
+    # icon (for third party)
+    if parser.has_option_desktop("X-AppInstall-Icon-Url"):
+        url = parser.get_desktop("X-AppInstall-Icon-Url")
+        doc.add_value(XapianValues.ICON_URL, url)
+        if not parser.has_option_desktop("X-AppInstall-Icon"):
+            # prefix pkgname to avoid name clashes
+            doc.add_value(XapianValues.ICON, "%s-icon-%s" % (
+                    pkgname, os.path.basename(url)))
+
+    # price (pay stuff)
+    if parser.has_option_desktop("X-AppInstall-Price"):
+        price = parser.get_desktop("X-AppInstall-Price")
+        doc.add_value(XapianValues.PRICE, price)
+        # since this is a commercial app, indicate it in the component value
+        doc.add_value(XapianValues.ARCHIVE_SECTION, "commercial")
+    # support url (mainly pay stuff)
+    if parser.has_option_desktop("X-AppInstall-Support-Url"):
+        url = parser.get_desktop("X-AppInstall-Support-Url")
+        doc.add_value(XapianValues.SUPPORT_SITE_URL, url)
+    # icon
+    if parser.has_option_desktop("Icon"):
+        icon = parser.get_desktop("Icon")
+        doc.add_value(XapianValues.ICON, icon)
+    # write out categories
+    for cat in parser.get_desktop_categories():
+        doc.add_term("AC"+cat.lower())
+    categories_string = ";".join(parser.get_desktop_categories())
+    doc.add_value(XapianValues.CATEGORIES, categories_string)
+    for mime in parser.get_desktop_mimetypes():
+        doc.add_term("AM"+mime.lower())
+    # get type (to distinguish between apps and packages
+    if parser.has_option_desktop("Type"):
+        type = parser.get_desktop("Type")
+        doc.add_term("AT"+type.lower())
+    # check gettext domain
+    if parser.has_option_desktop("X-Ubuntu-Gettext-Domain"):
+        domain = parser.get_desktop("X-Ubuntu-Gettext-Domain")
+        doc.add_value(XapianValues.GETTEXT_DOMAIN, domain)
+    # Description (software-center extension)
+    if parser.has_option_desktop("X-AppInstall-Description"):
+        descr = parser.get_desktop("X-AppInstall-Description")
+        doc.add_value(XapianValues.SC_DESCRIPTION, descr)
+    if parser.has_option_desktop("Supported-Distros"):
+        doc.add_value(XapianValues.SC_SUPPORTED_DISTROS,
+            json.dumps(parser.get_desktop("Supported-Distros")))
+
+    # popcon
+    # FIXME: popularity not only based on popcon but also
+    #        on archive section, third party app etc
+    if parser.has_option_desktop("X-AppInstall-Popcon"):
+        popcon = float(parser.get_desktop("X-AppInstall-Popcon"))
+        # sort_by_value uses string compare, so we need to pad here
+        doc.add_value(XapianValues.POPCON, 
+                      xapian.sortable_serialise(popcon))
+        global popcon_max
+        popcon_max = max(popcon_max, popcon)
+
+    # comment goes into the summary data if there is one,
+    # other wise we try GenericName and if nothing else,
+    # the summary of the package
+    if parser.has_option_desktop("Comment"):
+        s = parser.get_desktop("Comment")
+        doc.add_value(XapianValues.SUMMARY, s)
+    elif parser.has_option_desktop("GenericName"):
+        s = parser.get_desktop("GenericName")
+        if s != name:
+            doc.add_value(XapianValues.SUMMARY, s)
+    elif pkgname in cache and cache[pkgname].candidate:
+        s = cache[pkgname].candidate.summary
+        doc.add_value(XapianValues.SUMMARY, s)
+
+    return doc
+
+
 def index_app_info_from_parser(parser, db, cache):
         term_generator = xapian.TermGenerator()
         term_generator.set_database(db)
@@ -633,201 +835,18 @@
             term_generator.set_flags(xapian.TermGenerator.FLAG_SPELLING)
         except xapian.UnimplementedError:
             pass
-        doc = xapian.Document()
+        doc = make_doc_from_parser(parser, cache)
         term_generator.set_document(doc)
-        # app name is the data
-        if parser.has_option_desktop("X-Ubuntu-Software-Center-Name"):
-            name = parser.get_desktop("X-Ubuntu-Software-Center-Name")
-            untranslated_name = parser.get_desktop("X-Ubuntu-Software-Center-Name", translated=False)
-        elif parser.has_option_desktop("X-GNOME-FullName"):
-            name = parser.get_desktop("X-GNOME-FullName")
-            untranslated_name = parser.get_desktop("X-GNOME-FullName", translated=False)
-        else:
-            name = parser.get_desktop("Name")
-            untranslated_name = parser.get_desktop("Name", translated=False)
+        name = doc.get_data()
+
         if name in seen:
             LOG.debug("duplicated name '%s' (%s)" % (name, parser.desktopf))
         LOG.debug("indexing app '%s'" % name)
         seen.add(name)
-        doc.set_data(name)
+
         index_name(doc, name, term_generator)
-        doc.add_value(XapianValues.APPNAME_UNTRANSLATED, untranslated_name)
-
-        # check if we should ignore this file
-        if parser.has_option_desktop("X-AppInstall-Ignore"):
-            ignore = parser.get_desktop("X-AppInstall-Ignore")
-            if ignore.strip().lower() == "true":
-                LOG.debug("X-AppInstall-Ignore found for '%s'" % parser.desktopf)
-                return
-        # architecture
-        pkgname_extension = ''
-        if parser.has_option_desktop("X-AppInstall-Architectures"):
-            arches = parser.get_desktop("X-AppInstall-Architectures")
-            doc.add_value(XapianValues.ARCHIVE_ARCH, arches)
-            native_archs = get_current_arch() in arches.split(',')
-            foreign_archs = list(set(arches.split(',')) & set(get_foreign_architectures()))
-            if not (native_archs or foreign_archs): return
-            if not native_archs and foreign_archs:
-                pkgname_extension = ':' + foreign_archs[0]
-        # package name
-        pkgname = parser.get_desktop("X-AppInstall-Package") + pkgname_extension
-        doc.add_term("AP"+pkgname)
-        if '-' in pkgname:
-            # we need this to work around xapian oddness
-            doc.add_term(pkgname.replace('-','_'))
-        doc.add_value(XapianValues.PKGNAME, pkgname)
-        doc.add_value(XapianValues.DESKTOP_FILE, parser.desktopf)
-        # display name
-        if "display_name" in axi_values:
-            doc.add_value(axi_values["display_name"], name)
-        # cataloged_times
-        if "catalogedtime" in axi_values:
-            if pkgname in cataloged_times:
-                doc.add_value(axi_values["catalogedtime"], 
-                              xapian.sortable_serialise(cataloged_times[pkgname]))
-        # pocket (main, restricted, ...)
-        if parser.has_option_desktop("X-AppInstall-Section"):
-            archive_section = parser.get_desktop("X-AppInstall-Section")
-            doc.add_term("AS"+archive_section)
-            doc.add_value(XapianValues.ARCHIVE_SECTION, archive_section)
-        # section (mail, base, ..)
-        if pkgname in cache and cache[pkgname].candidate:
-            section = cache[pkgname].section
-            doc.add_term("AE"+section)
-        # channel (third party stuff)
-        if parser.has_option_desktop("X-AppInstall-Channel"):
-            archive_channel = parser.get_desktop("X-AppInstall-Channel")
-            doc.add_term("AH"+archive_channel)
-            doc.add_value(XapianValues.ARCHIVE_CHANNEL, archive_channel)
-        # signing key (third party)
-        if parser.has_option_desktop("X-AppInstall-Signing-Key-Id"):
-            keyid = parser.get_desktop("X-AppInstall-Signing-Key-Id")
-            doc.add_value(XapianValues.ARCHIVE_SIGNING_KEY_ID, keyid)
-        # license (third party)
-        if parser.has_option_desktop("X-AppInstall-License"):
-            license = parser.get_desktop("X-AppInstall-License")
-            doc.add_value(XapianValues.LICENSE, license)
-        # date published
-        if parser.has_option_desktop("X-AppInstall-Date-Published"):
-            date_published = parser.get_desktop("X-AppInstall-Date-Published")
-            if date_published:
-                # strip the subseconds from the end of the published date string
-                date_published = str(date_published).split(".")[0]
-                doc.add_value(XapianValues.DATE_PUBLISHED,
-                              date_published)
-                # we use the date published value for the cataloged time as well
-                if "catalogedtime" in axi_values:
-                    LOG.debug(
-                            ("pkgname: %s, date_published cataloged time is: %s" %
-                                 (pkgname, parser.get_desktop("date_published"))))
-                    date_published_sec = time.mktime(
-                                            time.strptime(date_published,
-                                                          "%Y-%m-%d  %H:%M:%S"))
-                    doc.add_value(axi_values["catalogedtime"], 
-                                  xapian.sortable_serialise(date_published_sec))
-        # purchased date
-        if parser.has_option_desktop("X-AppInstall-Purchased-Date"):
-            date = parser.get_desktop("X-AppInstall-Purchased-Date")
-            # strip the subseconds from the end of the date string
-            doc.add_value(XapianValues.PURCHASED_DATE, str(date).split(".")[0])
-        # deb-line (third party)
-        if parser.has_option_desktop("X-AppInstall-Deb-Line"):
-            debline = parser.get_desktop("X-AppInstall-Deb-Line")
-            doc.add_value(XapianValues.ARCHIVE_DEB_LINE, debline)
-        # license key (third party)
-        if parser.has_option_desktop("X-AppInstall-License-Key"):
-            key = parser.get_desktop("X-AppInstall-License-Key")
-            doc.add_value(XapianValues.LICENSE_KEY, key)
-        # license keypath (third party)
-        if parser.has_option_desktop("X-AppInstall-License-Key-Path"):
-            path = parser.get_desktop("X-AppInstall-License-Key-Path")
-            doc.add_value(XapianValues.LICENSE_KEY_PATH, path)
-        # PPA (third party stuff)
-        if parser.has_option_desktop("X-AppInstall-PPA"):
-            archive_ppa = parser.get_desktop("X-AppInstall-PPA")
-            doc.add_value(XapianValues.ARCHIVE_PPA, archive_ppa)
-            # add archive origin data here so that its available even if
-            # the PPA is not (yet) enabled
-            doc.add_term("XOO"+"lp-ppa-%s" % archive_ppa.replace("/", "-"))
-        # screenshot (for third party)
-        if parser.has_option_desktop("X-AppInstall-Screenshot-Url"):
-            url = parser.get_desktop("X-AppInstall-Screenshot-Url")
-            doc.add_value(XapianValues.SCREENSHOT_URL, url)
-        # thumbnail (for third party)
-        if parser.has_option_desktop("X-AppInstall-Thumbnail-Url"):
-            url = parser.get_desktop("X-AppInstall-Thumbnail-Url")
-            doc.add_value(XapianValues.THUMBNAIL_URL, url)
-        # video support (for third party mostly)
-        if parser.has_option_desktop("X-AppInstall-Video-Url"):
-            url = parser.get_desktop("X-AppInstall-Video-Url")
-            doc.add_value(XapianValues.VIDEO_URL, url)
-        # icon (for third party)
-        if parser.has_option_desktop("X-AppInstall-Icon-Url"):
-            url = parser.get_desktop("X-AppInstall-Icon-Url")
-            doc.add_value(XapianValues.ICON_URL, url)
-            if not parser.has_option_desktop("X-AppInstall-Icon"):
-                # prefix pkgname to avoid name clashes
-                doc.add_value(XapianValues.ICON, "%s-icon-%s" % (
-                        pkgname, os.path.basename(url)))
-
-        # price (pay stuff)
-        if parser.has_option_desktop("X-AppInstall-Price"):
-            price = parser.get_desktop("X-AppInstall-Price")
-            doc.add_value(XapianValues.PRICE, price)
-            # since this is a commercial app, indicate it in the component value
-            doc.add_value(XapianValues.ARCHIVE_SECTION, "commercial")
-        # support url (mainly pay stuff)
-        if parser.has_option_desktop("X-AppInstall-Support-Url"):
-            url = parser.get_desktop("X-AppInstall-Support-Url")
-            doc.add_value(XapianValues.SUPPORT_SITE_URL, url)
-        # icon
-        if parser.has_option_desktop("Icon"):
-            icon = parser.get_desktop("Icon")
-            doc.add_value(XapianValues.ICON, icon)
-        # write out categories
-        for cat in parser.get_desktop_categories():
-            doc.add_term("AC"+cat.lower())
-        categories_string = ";".join(parser.get_desktop_categories())
-        doc.add_value(XapianValues.CATEGORIES, categories_string)
-        for mime in parser.get_desktop_mimetypes():
-            doc.add_term("AM"+mime.lower())
-        # get type (to distinguish between apps and packages
-        if parser.has_option_desktop("Type"):
-            type = parser.get_desktop("Type")
-            doc.add_term("AT"+type.lower())
-        # check gettext domain
-        if parser.has_option_desktop("X-Ubuntu-Gettext-Domain"):
-            domain = parser.get_desktop("X-Ubuntu-Gettext-Domain")
-            doc.add_value(XapianValues.GETTEXT_DOMAIN, domain)
-        # Description (software-center extension)
-        if parser.has_option_desktop("X-AppInstall-Description"):
-            descr = parser.get_desktop("X-AppInstall-Description")
-            doc.add_value(XapianValues.SC_DESCRIPTION, descr)
-        # popcon
-        # FIXME: popularity not only based on popcon but also
-        #        on archive section, third party app etc
-        if parser.has_option_desktop("X-AppInstall-Popcon"):
-            popcon = float(parser.get_desktop("X-AppInstall-Popcon"))
-            # sort_by_value uses string compare, so we need to pad here
-            doc.add_value(XapianValues.POPCON, 
-                          xapian.sortable_serialise(popcon))
-            global popcon_max
-            popcon_max = max(popcon_max, popcon)
-
-        # comment goes into the summary data if there is one,
-        # other wise we try GenericName and if nothing else,
-        # the summary of the package
-        if parser.has_option_desktop("Comment"):
-            s = parser.get_desktop("Comment")
-            doc.add_value(XapianValues.SUMMARY, s)
-        elif parser.has_option_desktop("GenericName"):
-            s = parser.get_desktop("GenericName")
-            if s != name:
-                doc.add_value(XapianValues.SUMMARY, s)
-        elif pkgname in cache and cache[pkgname].candidate:
-            s = cache[pkgname].candidate.summary
-            doc.add_value(XapianValues.SUMMARY, s)
-
+
+        pkgname = doc.get_value(XapianValues.PKGNAME)
         # add packagename as meta-data too
         term_generator.index_text_without_positions(pkgname, WEIGHT_APT_PKGNAME)
 

=== modified file 'softwarecenter/enums.py'
--- softwarecenter/enums.py	2012-01-18 21:27:30 +0000
+++ softwarecenter/enums.py	2012-01-19 14:07:24 +0000
@@ -140,6 +140,7 @@
     VIDEO_URL = 195
     DATE_PUBLISHED = 196
     SUPPORT_SITE_URL = 197
+    SC_SUPPORTED_DISTROS = 198
 
 # fake channels
 PURCHASED_NEEDS_REINSTALL_MAGIC_CHANNEL_NAME = "for-pay-needs-reinstall"
@@ -179,7 +180,8 @@
     # this *needs* to be last (for test_appdetails.py) and means
     # something went wrong and we don't have a state for this PKG
     UNKNOWN,
-    ) = range(15)
+    PURCHASED_BUT_NOT_AVAILABLE_FOR_SERIES,
+    ) = range(16)
 
 # visibility of non applications in the search results
 class NonAppVisibility:

=== modified file 'test/test_database.py'
--- test/test_database.py	2012-01-18 21:27:30 +0000
+++ test/test_database.py	2012-01-19 14:07:24 +0000
@@ -10,19 +10,28 @@
 import unittest
 import xapian
 
+from piston_mini_client import PistonResponseObject
+
 from softwarecenter.db.application import Application, AppDetails
 from softwarecenter.db.database import StoreDatabase
 from softwarecenter.db.enquire import AppEnquire
 from softwarecenter.db.database import parse_axi_values_file
 from softwarecenter.db.pkginfo import get_pkg_info
-from softwarecenter.db.update import (update_from_app_install_data,
-                                      update_from_var_lib_apt_lists,
-                                      update_from_appstream_xml,
-                                      update_from_software_center_agent)
+from softwarecenter.db.update import (
+    make_doc_from_parser,
+    update_from_app_install_data,
+    update_from_var_lib_apt_lists,
+    update_from_appstream_xml,
+    update_from_software_center_agent,
+    SCAPurchasedApplicationParser,
+    )
+from softwarecenter.distro import get_distro
 from softwarecenter.enums import (
     XapianValues,
     PkgStates,
     )
+from softwarecenter.testutils import get_test_db
+
 
 class TestDatabase(unittest.TestCase):
     """ tests the store database """
@@ -371,6 +380,106 @@
         self.assertTrue(len(enquirer.get_docids()) > 0)
         # FIXME: test more of the interface
 
+
+class AppDetailsPkgStateTestCase(unittest.TestCase):
+
+    def _make_app_details(self, supported_series=None):
+        subscription = {
+            u'application': {
+                u'archive_id': u'commercial-ppa-uploaders/photobomb',
+                u'description': u"Easy and Social Image Editor\nPhotobomb "
+                                u"give you easy access to images in your "
+                                u"social networking feeds, pictures on ...",
+                u'name': u'Photobomb',
+                u'package_name': u'photobomb',
+                u'signing_key_id': u'1024R/75254D99'
+                },
+            u'deb_line': u'deb https://some.user:ABCDEFGHIJKLMNOP@'
+                         u'private-ppa.launchpad.net/commercial-ppa-uploaders/'
+                         u'photobomb/ubuntu natty main',
+            u'distro_series': {u'code_name': u'natty', u'version': u'11.04'},
+            u'failures': [],
+            u'open_id': u'https://login.ubuntu.com/+id/ABCDEF',
+            u'purchase_date': u'2011-09-16 06:37:52',
+            u'purchase_price': u'2.99',
+            u'state': u'Complete',
+            }
+
+        if supported_series != None:
+            subscription['application']['series'] = supported_series
+
+        item = PistonResponseObject.from_dict(subscription)
+        parser = SCAPurchasedApplicationParser(item)
+        doc = make_doc_from_parser(parser, self.db._aptcache)
+        app_details = AppDetails(self.db, doc)
+        return app_details
+
+    @classmethod
+    def setUpClass(cls):
+        # Set these as class attributes as we don't modify either
+        # during the tests.
+        cls.distro = get_distro()
+        cls.db = get_test_db()
+   
+    def test_package_state_purchased_enable_repo(self):
+        # If the current series is supported by the app, the state should
+        # be PURCHASED_BUT_REPO_MUST_BE_ENABLED.
+        app_details = self._make_app_details(
+            supported_series={
+                'current-1': ['i386', 'amd64'],
+                self.distro.get_codename(): [self.distro.get_architecture()]
+                })
+
+        state = app_details.pkg_state
+
+        self.assertEqual(
+            PkgStates.PURCHASED_BUT_REPO_MUST_BE_ENABLED,
+            state)
+
+    def test_package_state_purchased_not_available(self):
+        # If the current series is NOT supported by the app, the state should
+        # be PURCHASED_BUT_NOT_AVAILABLE_FOR_SERIES.
+        app_details = self._make_app_details(
+            supported_series={
+                'current-1': ['i386', 'amd64'],
+                self.distro.get_codename(): ['newarch', 'amdm128'],
+                })
+
+        state = app_details.pkg_state
+
+        self.assertEqual(
+            PkgStates.PURCHASED_BUT_NOT_AVAILABLE_FOR_SERIES,
+            state)
+
+    def test_package_state_no_series(self):
+        # Until the fix for bug 917109 is deployed on production, we
+        # should default to the current (broken) behaviour of
+        # indicating that the repo just needs enabling.
+        app_details = self._make_app_details(supported_series=None)
+
+        state = app_details.pkg_state
+
+        self.assertEqual(
+            PkgStates.PURCHASED_BUT_REPO_MUST_BE_ENABLED,
+            state)
+
+    def test_package_state_arch_any(self):
+        # In the future the supported arches returned by sca will include
+        # any - let's not break when that happens.
+        app_details = self._make_app_details(
+            supported_series={
+                'current-1': ['i386', 'amd64'],
+                self.distro.get_codename(): ['newarch', 'any'],
+                })
+
+        state = app_details.pkg_state
+
+        self.assertEqual(
+            PkgStates.PURCHASED_BUT_REPO_MUST_BE_ENABLED,
+            state)
+
+
+
 if __name__ == "__main__":
     import logging
     logging.basicConfig(level=logging.DEBUG)

=== modified file 'test/test_reinstall_purchased.py'
--- test/test_reinstall_purchased.py	2012-01-18 09:38:45 +0000
+++ test/test_reinstall_purchased.py	2012-01-19 14:07:24 +0000
@@ -295,6 +295,26 @@
             PURCHASED_NEEDS_REINSTALL_MAGIC_CHANNEL_NAME,
             parser.get_desktop('Channel'))
 
+    def test_will_handle_supported_distros_when_available(self):
+        # When the fix for bug 917109 reaches production, we will be
+        # able to use the supported series.
+        parser = self._make_application_parser()
+        supported_distros = {
+            "maverick": [
+                "i386",
+                "amd64"
+                ],
+            "natty": [
+                "i386",
+                "amd64"
+                ],
+            }
+        parser.sca_application.series = supported_distros
+
+        self.assertEqual(
+            supported_distros,
+            parser.get_desktop('Supported-Distros'))
+
 
 if __name__ == "__main__":
     logging.basicConfig(level=logging.DEBUG)