Merge lp:~bac/launchpad/bug-512408 into lp:launchpad

[Brad Crittenden]

Project index page packaging portlet suggests which Ubuntu package it may be associated.

[Brad Crittenden (bac)]

= Summary =

Change the packaging portlet on the product index page to suggest Ubuntu packages
that may be potential matches if the product is not currently linked.

== Proposed fix ==

Create a new view to query ubuntu.searchSourcePackages and show the results in the
portlet.

== Pre-implementation notes ==

Chats with Curtis.

== Implementation details ==

As above.

== Tests ==

bin/test -vvm lp.registry -t product-portlet-packages-view.txt \
   -t xx-product-index.txt

== Demo and Q/A ==

In launchpad.dev create a product called pmount. Visit https://launchpad.dev/pmount
and see that the pmount package in the sample data is suggested. Make the link and
then marvel that it is shown on the product's index page.

= Launchpad lint =

Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.

Linting changed files:
  lib/lp/registry/browser/configure.zcml
  lib/lp/registry/stories/packaging/xx-sourcepackage-packaging.txt
  lib/lp/registry/browser/product.py
  lib/lp/registry/browser/tests/product-views.txt
  lib/lp/registry/browser/tests/product-portlet-packages-view.txt
  lib/lp/registry/templates/product-portlet-packages.pt
  lib/lp/registry/tests/test_doc_product.py
  lib/lp/registry/stories/product/xx-product-index.txt

== Pylint notices ==

lib/lp/registry/browser/product.py
    59: [F0401] Unable to import 'lazr.delegates' (No module named delegates)

[Aaron Bentley (abentley)]

review: Approve

[Curtis Hovey (sinzui)]

Hi Brad.

The UI looks and behaves well and I think it is good to land, but there is an implementation issue.

As we saw on IRC, The UI prompts me to create duplicate packaging links. The list of candiates is not filtering the packages that have packaging links. My test case was to create a link to lucid pmount from applets. When I registered pmount, I was prompted to link it to lucid pmount--which leads to a db constraint violation in db-devel and a NotOneError in devel when I vistit lucid pmount.

review: Approve (ui)

[Brad Crittenden (bac)]

Curtis I made the change you requested.

In the process of writing the tests I needed to use Barry's 'stop()' command but it was only available to page tests, not doc tests, so I did a quick drive-by to move it over.

Diff @ http://pastebin.ubuntu.com/386572/

[Curtis Hovey (sinzui)]

All this is lovely, unlike merge reviews which just ate my UI approve because I wanted to give you my code approve.

review: Approve (code + ui)

=== modified file 'lib/canonical/launchpad/testing/pages.py'
--- lib/canonical/launchpad/testing/pages.py	2010-02-24 23:18:40 +0000
+++ lib/canonical/launchpad/testing/pages.py	2010-03-06 12:18:33 +0000
@@ -14,7 +14,6 @@
 import pprint
 import re
 import transaction
-import sys
 import unittest
 
 from BeautifulSoup import (
@@ -34,7 +33,7 @@
     IOAuthConsumerSet, OAUTH_REALM, ILaunchpadCelebrities,
     TeamMembershipStatus)
 from canonical.launchpad.testing.systemdocs import (
-    LayeredDocFileSuite, SpecialOutputChecker, strip_prefix)
+    LayeredDocFileSuite, SpecialOutputChecker, stop, strip_prefix)
 from canonical.launchpad.webapp import canonical_url
 from canonical.launchpad.webapp.interfaces import OAuthPermission
 from canonical.launchpad.webapp.url import urlsplit
@@ -715,16 +714,6 @@
     return setupBrowser(auth='Basic [e-mail]:test')
 
 
-def stop():
-    # Temporarily restore the real stdout.
-    old_stdout = sys.stdout
-    sys.stdout = sys.__stdout__
-    try:
-        pdb.set_trace()
-    finally:
-        sys.stdout = old_stdout
-
-
 def setUpGlobs(test):
     test.globs['transaction'] = transaction
     test.globs['http'] = UnstickyCookieHTTPCaller()
 
=== modified file 'lib/canonical/launchpad/testing/systemdocs.py'
--- lib/canonical/launchpad/testing/systemdocs.py	2009-10-15 11:47:32 +0000
+++ lib/canonical/launchpad/testing/systemdocs.py	2010-03-06 12:18:33 +0000
@@ -10,12 +10,14 @@
     'SpecialOutputChecker',
     'setUp',
     'setGlobs',
+    'stop',
     'strip_prefix',
     'tearDown',
     ]
 
 import logging
 import os
+import pdb
 import pprint
 import sys
 
@@ -170,6 +172,16 @@
         "%r: %r" % (key, value) for key, value in sorted(dict.items()))
 
 
+def stop():
+    # Temporarily restore the real stdout.
+    old_stdout = sys.stdout
+    sys.stdout = sys.__stdout__
+    try:
+        pdb.set_trace()
+    finally:
+        sys.stdout = old_stdout
+
+
 def setGlobs(test):
     """Add the common globals for testing system documentation."""
     test.globs['ANONYMOUS'] = ANONYMOUS
@@ -186,6 +198,7 @@
     test.globs['ordered_dict_as_string'] = ordered_dict_as_string
     test.globs['verifyObject'] = verifyObject
     test.globs['pretty'] = pprint.PrettyPrinter(width=1).pformat
+    test.globs['stop'] = stop
 
 
 def setUp(test):
 
=== modified file 'lib/lp/registry/browser/configure.zcml'
--- lib/lp/registry/browser/configure.zcml	2010-03-05 14:18:18 +0000
+++ lib/lp/registry/browser/configure.zcml	2010-03-06 12:18:33 +0000
@@ -1412,15 +1412,18 @@
             facet="overview"
             template="../templates/product-portlet-license-missing.pt"/>
         <browser:page
-            name="+portlet-packages"
-            facet="overview"
-            template="../templates/product-portlet-packages.pt"/>
-        <browser:page
             name="+purchase-subscription"
             template="../templates/product-purchase-subscription.pt"/>
     </browser:pages>
     <browser:page
         for="lp.registry.interfaces.product.IProduct"
+        permission="zope.Public"
+        name="+portlet-packages"
+        facet="overview"
+        class="lp.registry.browser.product.ProductPackagesPortletView"
+        template="../templates/product-portlet-packages.pt"/>
+    <browser:page
+        for="lp.registry.interfaces.product.IProduct"
         class="lp.registry.browser.product.ProductSeriesView"
         name="+series"
         facet="overview"
 
=== modified file 'lib/lp/registry/browser/product.py'
--- lib/lp/registry/browser/product.py	2010-02-16 21:21:14 +0000
+++ lib/lp/registry/browser/product.py	2010-03-06 12:18:33 +0000
@@ -21,6 +21,7 @@
     'ProductNavigationMenu',
     'ProductOverviewMenu',
     'ProductPackagesView',
+    'ProductPackagesPortletView',
     'ProductRdfView',
     'ProductReviewLicenseView',
     'ProductSeriesView',
@@ -37,6 +38,7 @@
     ]
 
 
+from cgi import escape
 from operator import attrgetter
 
 from zope.component import getUtility
@@ -45,6 +47,9 @@
 from zope.lifecycleevent import ObjectCreatedEvent
 from zope.interface import implements, Interface
 from zope.formlib import form
+from zope.schema import Choice
+from zope.schema.vocabulary import (
+    SimpleVocabulary, SimpleTerm)
 
 from z3c.ptcompat import ViewPageTemplateFile
 
@@ -981,6 +986,56 @@
         return results
 
 
+class ProductPackagesPortletView(LaunchpadFormView):
+    """View class for product packaging portlet."""
+
+    schema = Interface
+    custom_widget(
+        'distributionsourcepackage', LaunchpadRadioWidget,
+        orientation='vertical')
+    suggestions = None
+
+    def setUpFields(self):
+        """See `LaunchpadFormView`."""
+        super(ProductPackagesPortletView, self).setUpFields()
+        ubuntu = getUtility(ILaunchpadCelebrities).ubuntu
+        source_packages = ubuntu.searchSourcePackages(self.context.name)
+        # Based upon the matches, create a new vocabulary with
+        # term descriptions that include a link to the source package.
+        self.suggestions = []
+        vocab_terms = []
+        for package in source_packages:
+            if package.upstream_product is not None:
+                continue
+            self.suggestions.append(package)
+            item_url = canonical_url(package)
+            description = """<a href="%s">%s</a>""" % (
+                item_url, escape(package.name))
+            vocab_terms.append(SimpleTerm(package, package.name, description))
+        vocabulary = SimpleVocabulary(vocab_terms)
+        self.form_fields = form.Fields(
+            Choice(__name__='distributionsourcepackage',
+                   title=_('Ubuntu packages'),
+                   default=None,
+                   vocabulary=vocabulary,
+                   required=True))
+
+    @action(_('Link to this Ubuntu Package'), name='link')
+    def link(self, action, data):
+        product = self.context
+        dsp = data.get('distributionsourcepackage')
+        assert dsp is not None, "distributionsourcepackage was not specified"
+        product_series = product.development_focus
+        ubuntu = getUtility(ILaunchpadCelebrities).ubuntu
+        product_series.setPackaging(ubuntu.currentseries,
+                                    dsp.sourcepackagename,
+                                    self.user)
+        self.request.response.addInfoNotification(
+            'This project was linked to the source package "%s"' %
+            dsp.displayname)
+        self.next_url = self.request.getURL()
+
+
 class SeriesReleasePair:
     """Class for holding a series and release.
 
 
=== added file 'lib/lp/registry/browser/tests/product-portlet-packages-view.txt'
--- lib/lp/registry/browser/tests/product-portlet-packages-view.txt	1970-01-01 00:00:00 +0000
+++ lib/lp/registry/browser/tests/product-portlet-packages-view.txt	2010-03-06 12:18:33 +0000
@@ -0,0 +1,174 @@
++portlet-packages
+-----------------
+
+When the product is not linked to a source package in Ubuntu the
++portlet-packages will show suggestions on potential matches and ask
+the user to make the connection.
+
+Create a helper to update the distribution source package cache, which
+does not happen automatically.
+
+    >>> from canonical.launchpad.testing.pages import find_tag_by_id
+    >>> from canonical.launchpad.testing.pages import extract_text
+    >>> from canonical.launchpad.interfaces.launchpad import (
+    ...     ILaunchpadCelebrities)
+    >>> from lp.registry.interfaces.product import IProductSet
+    >>> from lp.registry.interfaces.sourcepackagename import (
+    ...     ISourcePackageNameSet)
+
+    >>> import transaction
+    >>> from canonical.launchpad.scripts import QuietFakeLogger
+    >>> logger = QuietFakeLogger()
+    >>> from canonical.testing.layers import reconnect_stores
+    >>> from canonical.config import config
+    >>> def updateCache():
+    ...     # Switch to the statistician user who is the only user with
+    ...     # write permission to the source package cache tables.
+    ...     transaction.commit()
+    ...     reconnect_stores(config.statistician.dbuser)
+    ...     ubuntu = getUtility(ILaunchpadCelebrities).ubuntu
+    ...     updated = ubuntu.updateCompleteSourcePackageCache(
+    ...         archive=ubuntu.main_archive, log=logger, ztm=transaction)
+    ...     transaction.commit()
+    ...     reconnect_stores('launchpad')
+    ...     # Get ubuntu, our product, and the sourcepackage name again
+    ...     # since the transaction changed.
+    ...     ubuntu = getUtility(ILaunchpadCelebrities).ubuntu
+    ...     product = getUtility(IProductSet)['bingo']
+    ...     spn = getUtility(ISourcePackageNameSet)['bingo']
+    ...     login(ANONYMOUS)
+    ...     return (ubuntu, product, spn)
+
+
+Let's create a test project.
+
+    >>> product = factory.makeProduct(name="bingo")
+    >>> login_person(product.owner)
+    >>> view = create_initialized_view(
+    ...     product, name="+portlet-packages",
+    ...     principal=product.owner)
+    >>> print view.suggestions
+    []
+
+No distribution source packages match so the user is shown an
+appropriate message asking to suggest a match.
+
+    >>> content = find_tag_by_id(view.render(), 'portlet-packages')
+    >>> print extract_text(content)
+    All packages
+    Packages in Ubuntu
+    Launchpad doesn't know which Ubuntu packages this project
+    provides. Links from distribution packages to upstream projects
+    let distribution and upstream maintainers share bugs, patches, and
+    translations efficiently.
+    There are no unlinked source packages that are a good match. Can you suggest one?
+    Link to Ubuntu package
+
+
+A distribution source package in a distribution other than ubuntu will
+not be suggested.
+
+    >>> spn = factory.makeSourcePackageName(name="bingo")
+    >>> distro_package = factory.makeDistributionSourcePackage(
+    ...     sourcepackagename=spn)
+    >>> spph = factory.makeSourcePackagePublishingHistory(
+    ...     sourcepackagename=spn)
+    >>> (ubuntu, product, spn) = updateCache()
+    >>> view = create_initialized_view(
+    ...     product, name="+portlet-packages",
+    ...     principal=product.owner)
+    >>> print view.suggestions
+    []
+
+An Ubuntu distribution package that is not in the current series
+will be suggested.
+
+    >>> distro_package = factory.makeDistributionSourcePackage(
+    ...     sourcepackagename=spn, distribution=ubuntu)
+    >>> warty = ubuntu.getSeries('warty')
+    >>> warty == ubuntu.currentseries
+    False
+    >>> spph = factory.makeSourcePackagePublishingHistory(
+    ...     sourcepackagename=spn, distroseries=warty)
+    >>> (ubuntu, product, spn) = updateCache()
+    >>> view = create_initialized_view(
+    ...     product, name="+portlet-packages",
+    ...     principal=product.owner)
+    >>> for dsp in view.suggestions:
+    ...     print dsp.name
+    bingo
+
+And the user is presented with a form to select the distribution
+source package.
+
+    >>> content = find_tag_by_id(view.render(), 'portlet-packages')
+
+    >>> print extract_text(content)
+    All packages
+    Packages in Ubuntu
+    Launchpad doesn't know which Ubuntu packages this project
+    provides. Links from distribution packages to upstream projects
+    let distribution and upstream maintainers share bugs, patches, and
+    translations efficiently.
+    Ubuntu packages:
+    bingo...
+
+A distribution series with a matching name in the Ubuntu current
+series will be suggested.
+
+    >>> distro_package = factory.makeDistributionSourcePackage(
+    ...     sourcepackagename=spn, distribution=ubuntu)
+    >>> spph = factory.makeSourcePackagePublishingHistory(
+    ...     sourcepackagename=spn, distroseries=ubuntu.currentseries)
+    >>> (ubuntu, product, spn) = updateCache()
+    >>> view = create_initialized_view(
+    ...     product, name="+portlet-packages",
+    ...     principal=product.owner)
+    >>> for dsp in view.suggestions:
+    ...     print dsp.name
+    bingo
+
+If multiple source packages match they will all be displayed.
+
+    >>> spn = factory.makeSourcePackageName(name="ba-bingo")
+    >>> distro_package = factory.makeDistributionSourcePackage(
+    ...     sourcepackagename=spn, distribution=ubuntu)
+    >>> spph = factory.makeSourcePackagePublishingHistory(
+    ...     sourcepackagename=spn, distroseries=ubuntu.currentseries)
+    >>> (ubuntu, product, spn) = updateCache()
+    >>> view = create_initialized_view(
+    ...     product, name="+portlet-packages",
+    ...     principal=product.owner)
+    >>> for dsp in view.suggestions:
+    ...     print dsp.name
+    bingo
+    ba-bingo
+
+    >>> content = find_tag_by_id(view.render(), 'portlet-packages')
+    >>> print extract_text(content)
+    All packages
+    Packages in Ubuntu
+    Launchpad doesn't know which Ubuntu packages this project
+    provides. Links from distribution packages to upstream projects
+    let distribution and upstream maintainers share bugs, patches, and
+    translations efficiently.
+    Ubuntu packages:
+    bingo
+    ba-bingo...
+
+If a package matches by name but is already linked to an Ubuntu
+package then it will not be shown as one of the suggestions.
+
+    >>> new_product = factory.makeProduct(name="not-bingo")
+    >>> product_series = new_product.development_focus
+    >>> babingo_spn = getUtility(ISourcePackageNameSet)['ba-bingo']
+    >>> pkg = product_series.setPackaging(
+    ...     ubuntu.currentseries,
+    ...     babingo_spn, product.owner)
+    >>> (ubuntu, product, spn) = updateCache()
+    >>> view = create_initialized_view(
+    ...     product, name="+portlet-packages",
+    ...     principal=product.owner)
+    >>> for dsp in view.suggestions:
+    ...     print dsp.name
+    bingo
 
=== modified file 'lib/lp/registry/browser/tests/product-views.txt'
--- lib/lp/registry/browser/tests/product-views.txt	2010-02-17 11:19:42 +0000
+++ lib/lp/registry/browser/tests/product-views.txt	2010-03-06 12:18:33 +0000
@@ -478,3 +478,78 @@
     portlet-latest-bugs
     >>> print find_tag_by_id(content, 'portlet-blueprints')['id']
     portlet-blueprints
+
+
++portlet-packages
+-----------------
+
+When the product is not linked to a source package in Ubuntu the
++portlet-packages will show suggestions on potential matches and ask
+the user to make the connection.
+
+    >>> product = factory.makeProduct(name="bingo")
+    >>> login_person(product.owner)
+    >>> view = create_initialized_view(
+    ...     product, name="+portlet-packages",
+    ...     principal=product.owner)
+    >>> print view.suggestions
+    []
+
+    >>> content = find_tag_by_id(view.render(), 'portlet-packages')
+    >>> print extract_text(content)
+    All packages
+    Packages in Ubuntu
+    Launchpad doesn't know which Ubuntu packages this project
+    provides. Links from distribution packages to upstream projects
+    let distribution and upstream maintainers share bugs, patches, and
+    translations efficiently.
+    There are no unlinked source packages that are a good match.
+    Can you suggest one?
+    Link to Ubuntu package
+
+    >>> spn = factory.makeSourcePackageName(name="bingo")
+    >>> from canonical.launchpad.interfaces.launchpad import (
+    ...     ILaunchpadCelebrities)
+    >>> ubuntu = getUtility(ILaunchpadCelebrities).ubuntu
+    >>> distro_package = factory.makeDistributionSourcePackage(
+    ...     sourcepackagename=spn, distribution=ubuntu)
+    >>> spph = factory.makeSourcePackagePublishingHistory(
+    ...     sourcepackagename=spn, distroseries=ubuntu.currentseries)
+
+    >>> view = create_initialized_view(
+    ...     product, name="+portlet-packages",
+    ...     principal=product.owner)
+    >>> print view.suggestions
+    []
+
+    >>> distro_package = factory.makeDistributionSourcePackage(
+    ...     sourcepackagename=spn, distribution=ubuntu)
+
+    >>> view = create_initialized_view(
+    ...     product, name="+portlet-packages",
+    ...     principal=product.owner)
+    >>> print view.suggestions
+    []
+
+    >>> import transaction
+    >>> #transaction.commit()
+    >>> from canonical.launchpad.scripts import QuietFakeLogger
+    >>> logger = QuietFakeLogger()
+    >>> from canonical.testing.layers import reconnect_stores
+    >>> from canonical.config import config
+    >>> # Switch to the statistician user who is the only user with
+    >>> # write permission to the source package cache tables.
+    >>> reconnect_stores(config.statistician.dbuser)
+    >>> # LaunchpadZopelessLayer.switchDbUser(config.statistician.dbuser)
+    >>> ubuntu = getUtility(ILaunchpadCelebrities).ubuntu
+    >>> updated = ubuntu.updateCompleteSourcePackageCache(
+    ...     archive=ubuntu.main_archive, log=logger, ztm=transaction)
+    >>> transaction.commit()
+    >>> reconnect_stores('launchpad')
+    >>> login(ANONYMOUS)
+    >>> product = getUtility(IProductSet)['bingo']
+    >>> view = create_initialized_view(
+    ...     product, name="+portlet-packages",
+    ...     principal=product.owner)
+    >>> print view.suggestions
+    []
 
=== modified file 'lib/lp/registry/model/distributionsourcepackage.py'
--- lib/lp/registry/model/distributionsourcepackage.py	2010-02-27 20:20:03 +0000
+++ lib/lp/registry/model/distributionsourcepackage.py	2010-03-06 12:18:33 +0000
@@ -187,7 +187,7 @@
                           PackagePublishingStatus.PUBLISHED,
                           PackagePublishingStatus.OBSOLETE),
             clauseTables=["SourcePackagePublishingHistory",
-                          "SourcePackageRelease", 
+                          "SourcePackageRelease",
                           "DistroSeries"],
             orderBy=["status",
                      SQLConstant(
@@ -319,6 +319,7 @@
                 self.sourcepackagename)
             if source_package.direct_packaging is not None:
                 return source_package.direct_packaging.productseries.product
+        return None
 
     # XXX kiko 2006-08-16: Bad method name, no need to be a property.
     @property
 
=== modified file 'lib/lp/registry/stories/packaging/xx-sourcepackage-packaging.txt'
--- lib/lp/registry/stories/packaging/xx-sourcepackage-packaging.txt	2010-02-18 20:41:01 +0000
+++ lib/lp/registry/stories/packaging/xx-sourcepackage-packaging.txt	2010-03-06 12:18:33 +0000
@@ -1,13 +1,13 @@
 = Packaging =
 
-No Privileges Person visit the distroseries upstream linkes page for Hoary
+No Privileges Person visit the distroseries upstream links page for Hoary
 and sees that pmount is not linked.
 
     >>> user_browser.open(
     ...     'http://launchpad.dev/ubuntu/hoary/+needs-packaging')
     >>> print extract_text(find_tag_by_id(user_browser.contents, 'packages'))
-    Source Package	Bugs	Translations
-    pmount          No bugs	64 strings ...
+    Source Package      Bugs    Translations
+    pmount          No bugs     64 strings ...
 
 He looks at the pmount source package page in Hoary and reads that the
 upstream project is not set.
 
=== modified file 'lib/lp/registry/stories/product/xx-product-index.txt'
--- lib/lp/registry/stories/product/xx-product-index.txt	2009-10-30 15:40:55 +0000
+++ lib/lp/registry/stories/product/xx-product-index.txt	2010-03-06 12:18:33 +0000
@@ -348,3 +348,36 @@
     >>> anon_browser.open('http://launchpad.dev/firefox')
     >>> print extract_text(find_tag_by_id(anon_browser.contents, 'aliases'))
     Also known as: iceweasel, snowchicken
+
+
+Ubuntu packaging
+----------------
+
+If a product is packaged in Ubuntu the links are shown.
+
+    >>> user_browser.open('http://launchpad.dev/firefox')
+    >>> print extract_text(
+    ...     find_tag_by_id(user_browser.contents, 'portlet-packages'))
+    All packages
+    Packages in distributions
+    “mozilla-firefox” source package in Hoary
+    “mozilla-firefox” source package in Warty Version 0.9 uploaded on...
+
+A product that has linked packages now displays suggestions and asks
+the user to select the package.
+
+    >>> login(ANONYMOUS)
+    >>> product = factory.makeProduct(name='pmount')
+    >>> logout()
+    >>> user_browser.open('http://launchpad.dev/pmount')
+    >>> print extract_text(
+    ...     find_tag_by_id(user_browser.contents, 'portlet-packages'))
+    All packages...
+    Packages in Ubuntu...
+    Ubuntu packages:
+    pmount...
+
+    >>> user_browser.getControl(name='field.distributionsourcepackage').value = ['pmount']
+    >>> user_browser.getControl('Link to this Ubuntu Package').click()
+    >>> print_feedback_messages(user_browser.contents)
+    This project was linked to the source package "pmount in ubuntu"
 
=== modified file 'lib/lp/registry/templates/product-portlet-packages.pt'
--- lib/lp/registry/templates/product-portlet-packages.pt	2009-09-05 03:17:24 +0000
+++ lib/lp/registry/templates/product-portlet-packages.pt	2010-03-06 12:18:33 +0000
@@ -3,32 +3,71 @@
   xmlns:metal="http://xml.zope.org/namespaces/metal"
   xmlns:i18n="http://xml.zope.org/namespaces/i18n"
   omit-tag=""
-  define="packages context/sourcepackages"
-  condition="packages">
+  define="packages context/sourcepackages">
+
 <div class="portlet" id="portlet-packages">
-  <h2>
-    <span class="see-all"><a
-      tal:attributes="href context/menu:overview/packages/fmt:url">All
-      packages</a></span>
-    Packages in distributions
-  </h2>
-
-  <ul>
-    <tal:pair tal:repeat="package packages">
-      <li>
-        <a class="sprite package-source"
-          tal:attributes="href package/fmt:url"
-          tal:content="package/title">apache in ubuntu hoary</a>
-        <br />
-        <span class="registered"
-          tal:define="release package/currentrelease"
-          tal:condition="release">
-        <strong>Version
-          <tal:version content="release/version">2.3</tal:version></strong>
-        uploaded <tal:date replace="release/dateuploaded/fmt:displaydate" />
-        </span>
-      </li>
-    </tal:pair>
-  </ul>
+
+  <tal:has_packages condition="packages">
+    <h2>
+      <span class="see-all"><a
+        tal:attributes="href context/menu:overview/packages/fmt:url">All
+        packages</a></span>
+      Packages in distributions
+    </h2>
+
+    <ul>
+      <tal:pair tal:repeat="package packages">
+        <li>
+          <a class="sprite package-source"
+            tal:attributes="href package/fmt:url"
+            tal:content="package/title">apache in ubuntu hoary</a>
+          <br />
+          <span class="registered"
+            tal:define="release package/currentrelease"
+            tal:condition="release">
+          <strong>Version
+            <tal:version content="release/version">2.3</tal:version></strong>
+          uploaded <tal:date replace="release/dateuploaded/fmt:displaydate" />
+          </span>
+        </li>
+      </tal:pair>
+    </ul>
+  </tal:has_packages>
+
+  <tal:has_no_packages condition="not:packages">
+    <h2>
+      <span class="see-all"><a
+        tal:attributes="href context/menu:overview/packages/fmt:url">All
+        packages</a></span>
+      Packages in Ubuntu
+    </h2>
+
+    <p>
+      Launchpad doesn't know which Ubuntu packages this project
+      provides.  Links from distribution packages to upstream projects
+      let distribution and upstream maintainers share bugs, patches, and
+      translations efficiently.
+    </p>
+    <div id="suggestions" tal:condition="view/suggestions">
+      <div metal:use-macro="context/@@launchpad_form/form">
+        <div class="actions" metal:fill-slot="buttons">
+          <input tal:replace="structure view/link/render"/>
+              &nbsp;or&nbsp;
+              <a tal:replace="structure
+                              context/development_focus/menu:overview/ubuntupkg/fmt:link" />
+        </div>
+      </div>
+    </div>
+
+    <div id="suggestions" tal:condition="not:view/suggestions">
+      <p>
+        There are no unlinked source packages that are a good match.
+        Can you suggest one?
+      </p>
+      <a tal:replace="structure
+                      context/development_focus/menu:overview/ubuntupkg/fmt:link" />
+    </div>
+
+  </tal:has_no_packages>
 </div>
 </tal:root>
 
=== modified file 'lib/lp/registry/tests/test_doc_product.py'
--- lib/lp/registry/tests/test_doc_product.py	2009-06-30 16:56:07 +0000
+++ lib/lp/registry/tests/test_doc_product.py	2010-03-06 12:18:33 +0000
@@ -3,7 +3,7 @@
 
 """Test the doctests in the product module."""
 
-# XXX sinzui 2009-04-03 bug=354881: This test harness shold be removed
+# XXX sinzui 2009-04-03 bug=354881: This test harness should be removed
 # and the inline tests moved to docs/
 
 __metaclass__ = type