Merge lp:~edwin-grubbs/launchpad/bug-577492-needspackaging-duplicates into lp:launchpad

[Edwin Grubbs]

Summary
-------

Sped up +needs-packaging page and the needs-packaging portlet on the
distroseries +index page by making getPrioritizedUnlinkedSourcePackages()
return a result set, so that batching will result in a limited query.

Previously, the result set was turned into a list in order to format
each item as a dictionary. Therefore, it would load 13,000 source
packages, and then iterate just over the first batch.

I also fixed the name of getPrioritizedPackagings() and made it
return a result set instead of a list.

Tests
-----

./bin/test -vv -t 'test_distroseries|doc/distroseries.txt'

Demo and Q/A
------------

* Open https://staging.launchpad.net/ubuntu/maverick/+needs-packaging
  * It should not timeout.
* Open https://staging.launchpad.net/ubuntu/maverick/
  * The "Upstream packaging" portlet should say
    "Needs more information or linking to upstream" and list some source
    packages.

Lint
----

There are over 700 lint errors due to bad indentation in doctests, so I
will add those changes later, so that reviewers aren't scared away.

[Jelmer Vernooij (jelmer)]

Nice, I'm looking forward to seeing this land!

One minor comment: lib/lp/registry/browser/tests/test_distroseries_views.py mentions 2009 as the copyright year, that probably should be 2010..

review: Approve (code)

=== modified file 'lib/lp/registry/browser/distroseries.py'
--- lib/lp/registry/browser/distroseries.py	2010-05-24 22:04:19 +0000
+++ lib/lp/registry/browser/distroseries.py	2010-07-28 19:11:08 +0000
@@ -180,7 +180,6 @@
 
     # A search link isn't needed because the distro series overview
     # has a search form.
-
     def answers(self):
         text = 'Ask a question'
         url = canonical_url(self.context.distribution) + '/+addquestion'
@@ -332,10 +331,8 @@
 
     @cachedproperty
     def needs_linking(self):
-        """Return a list of 10 packages most in need of upstream linking.""" 
-        # XXX sinzui 2010-02-26 bug=528648: This method causes a timeout.
-        # return self.context.getPrioritizedUnlinkedSourcePackages()[:10]
-        return None
+        """Return a list of 10 packages most in need of upstream linking."""
+        return self.context.getPrioritizedUnlinkedSourcePackages()[:10]
 
     milestone_can_release = False
 
@@ -481,7 +478,7 @@
     @cachedproperty
     def cached_packagings(self):
         """The batched upstream packaging links."""
-        packagings = self.context.getPrioritizedlPackagings()
+        packagings = self.context.getPrioritizedPackagings()
         navigator = BatchNavigator(packagings, self.request, size=20)
         navigator.setHeadings('packaging', 'packagings')
         return navigator
 
=== added file 'lib/lp/registry/browser/tests/test_distroseries_views.py'
--- lib/lp/registry/browser/tests/test_distroseries_views.py	1970-01-01 00:00:00 +0000
+++ lib/lp/registry/browser/tests/test_distroseries_views.py	2010-07-28 19:11:08 +0000
@@ -0,0 +1,52 @@
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+__metaclass__ = type
+
+import unittest
+
+from storm.zope.interfaces import IResultSet
+
+from zope.component import getUtility
+from zope.security.proxy import removeSecurityProxy
+
+from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
+from canonical.testing import LaunchpadZopelessLayer
+from lp.testing import TestCaseWithFactory
+from lp.testing.views import create_initialized_view
+
+
+class TestDistroSeriesNeedsPackagesView(TestCaseWithFactory):
+    """Test the distroseries +needs-packaging view."""
+
+    layer = LaunchpadZopelessLayer
+
+    def test_cached_unlinked_packages(self):
+        ubuntu = getUtility(ILaunchpadCelebrities).ubuntu
+        distroseries = self.factory.makeDistroSeries(distribution=ubuntu)
+        view = create_initialized_view(distroseries, '+needs-packaging')
+        naked_packages = removeSecurityProxy(view.cached_unlinked_packages)
+        self.assertTrue(
+            IResultSet.providedBy(
+                view.cached_unlinked_packages.currentBatch().list),
+            '%s should batch IResultSet so that slicing will limit the '
+            'query' % view.cached_unlinked_packages.currentBatch().list)
+
+
+class TestDistroSeriesView(TestCaseWithFactory):
+    """Test the distroseries +index view."""
+
+    layer = LaunchpadZopelessLayer
+
+    def test_needs_linking(self):
+        ubuntu = getUtility(ILaunchpadCelebrities).ubuntu
+        distroseries = self.factory.makeDistroSeries(distribution=ubuntu)
+        view = create_initialized_view(distroseries, '+index')
+        self.assertTrue(
+            IResultSet.providedBy(view.needs_linking),
+            '%s should implement IResultSet so that slicing will limit the '
+            'query' % view.needs_linking)
+
+
+def test_suite():
+    return unittest.TestLoader().loadTestsFromName(__name__)
 
=== modified file 'lib/lp/registry/doc/distroseries.txt'
--- lib/lp/registry/doc/distroseries.txt	2010-07-20 09:36:17 +0000
+++ lib/lp/registry/doc/distroseries.txt	2010-07-28 19:11:08 +0000
@@ -4,9 +4,10 @@
 From the DerivationOverview spec
 <https://launchpad.canonical.com/DerivationOverview>:
 
-    A distribution of GNU/Linux comprises a set of packages, an installer,
-    possibly a live-CD, some amount of metadata associated with the arrangement
-    of those elements and also a lot of information on managing it.
+    A distribution of GNU/Linux comprises a set of packages, an
+    installer, possibly a live-CD, some amount of metadata associated
+    with the arrangement of those elements and also a lot of information
+    on managing it.
 
 A distro series is a given version of a distribution. So, for Ubuntu, there
 are releases (or planned releases) like "warty", "hoary" and "bendy".
@@ -165,40 +166,40 @@
 canUploadToPocket method helps us to decide if an upload is allowed or
 not, according the distroseries status and the upload target pocket.
 
-   >>> from canonical.launchpad.interfaces import IDistributionSet
-   >>> ubuntu = getUtility(IDistributionSet)['ubuntu']
-   >>> breezy_autotest = ubuntu['breezy-autotest']
-   >>> hoary = ubuntu['hoary']
-
-   >>> from lp.registry.interfaces.pocket import PackagePublishingPocket
-   >>> from canonical.launchpad.interfaces import SeriesStatus
-
-   >>> warty.status.name
-   'CURRENT'
-   >>> warty.canUploadToPocket(PackagePublishingPocket.RELEASE)
-   False
-   >>> warty.canUploadToPocket(PackagePublishingPocket.SECURITY)
-   True
-
-   >>> breezy_autotest.status.name
-   'EXPERIMENTAL'
-   >>> breezy_autotest.canUploadToPocket(PackagePublishingPocket.RELEASE)
-   True
-   >>> breezy_autotest.canUploadToPocket(PackagePublishingPocket.SECURITY)
-   False
+    >>> from canonical.launchpad.interfaces import IDistributionSet
+    >>> ubuntu = getUtility(IDistributionSet)['ubuntu']
+    >>> breezy_autotest = ubuntu['breezy-autotest']
+    >>> hoary = ubuntu['hoary']
+
+    >>> from lp.registry.interfaces.pocket import PackagePublishingPocket
+    >>> from canonical.launchpad.interfaces import SeriesStatus
+
+    >>> warty.status.name
+    'CURRENT'
+    >>> warty.canUploadToPocket(PackagePublishingPocket.RELEASE)
+    False
+    >>> warty.canUploadToPocket(PackagePublishingPocket.SECURITY)
+    True
+
+    >>> breezy_autotest.status.name
+    'EXPERIMENTAL'
+    >>> breezy_autotest.canUploadToPocket(PackagePublishingPocket.RELEASE)
+    True
+    >>> breezy_autotest.canUploadToPocket(PackagePublishingPocket.SECURITY)
+    False
 
 The FROZEN status is special.  Uploads are allowed for all pockets as
 the upload will have to wait for manual approval anyway:
 
-   >>> from zope.security.proxy import removeSecurityProxy
-   >>> removeSecurityProxy(hoary).status = SeriesStatus.FROZEN
+    >>> from zope.security.proxy import removeSecurityProxy
+    >>> removeSecurityProxy(hoary).status = SeriesStatus.FROZEN
 
-   >>> hoary.status.name
-   'FROZEN'
-   >>> hoary.canUploadToPocket(PackagePublishingPocket.RELEASE)
-   True
-   >>> hoary.canUploadToPocket(PackagePublishingPocket.SECURITY)
-   True
+    >>> hoary.status.name
+    'FROZEN'
+    >>> hoary.canUploadToPocket(PackagePublishingPocket.RELEASE)
+    True
+    >>> hoary.canUploadToPocket(PackagePublishingPocket.SECURITY)
+    True
 
 
 Package searching
@@ -232,44 +233,45 @@
 are valid for that distroseries. These selections are used by (among
 other things) the uploader for validating incoming uploads.
 
-   >>> hoary = distroseriesset.get(3)
-   >>> for c in hoary.components:
-   ...     print c.name
-   main
-   restricted
-   >>> for s in hoary.sections:
-   ...     print s.name
-   base
-   web
-   editors
-   admin
-   devel
-   translations
-
-   >>> from canonical.launchpad.interfaces import (
-   ...    IComponentSet, ISectionSet)
-   >>> python = getUtility(ISectionSet).ensure('python')
-
-   >>> hoary.addSection(python)
-
-   >>> for c in hoary.components:
-   ...     print c.name
-   main
-   restricted
-
-   >>> for s in hoary.sections:
-   ...     print s.name
-   base
-   web
-   editors
-   admin
-   devel
-   python
-   translations
+    >>> hoary = distroseriesset.get(3)
+    >>> for c in hoary.components:
+    ...     print c.name
+    main
+    restricted
+    >>> for s in hoary.sections:
+    ...     print s.name
+    base
+    web
+    editors
+    admin
+    devel
+    translations
+
+    >>> from canonical.launchpad.interfaces import (
+    ...    IComponentSet, ISectionSet)
+    >>> python = getUtility(ISectionSet).ensure('python')
+
+    >>> hoary.addSection(python)
+
+    >>> for c in hoary.components:
+    ...     print c.name
+    main
+    restricted
+
+    >>> for s in hoary.sections:
+    ...     print s.name
+    base
+    web
+    editors
+    admin
+    devel
+    python
+    translations
 
 Breezy-autotest has got a partner component, which is not reported:
 
-    >>> breezyautotest = distroseriesset.queryByName(ubuntu, "breezy-autotest")
+    >>> breezyautotest = distroseriesset.queryByName(
+    ...     ubuntu, "breezy-autotest")
     >>> for c in breezyautotest.components:
     ...     print c.name
     main
@@ -307,22 +309,22 @@
 publishing records etc. Essentially this is a "Do not push this button
 again" type set of assertions.
 
-   >>> login("[e-mail]")
-   >>> humpy = ubuntu.newSeries('humpy', 'Humpy Hippo',
-   ...                          'The Humpy Hippo', 'Fat', 'Yo Momma',
-   ...                          '99.2',hoary, hoary.owner)
-   >>> humpy_i386 = humpy.newArch('i386', hoary['i386'].processorfamily,
-   ...                            True, humpy.owner)
-   >>> humpy.nominatedarchindep = humpy_i386
-   >>> humpy.initialiseFromParent()
-   >>> len(hoary.getPublishedReleases('pmount'))
-   1
-   >>> len(humpy.getPublishedReleases('pmount'))
-   1
-   >>> len(hoary['i386'].getReleasedPackages('pmount'))
-   1
-   >>> len(humpy_i386.getReleasedPackages('pmount'))
-   1
+    >>> login("[e-mail]")
+    >>> humpy = ubuntu.newSeries('humpy', 'Humpy Hippo',
+    ...                          'The Humpy Hippo', 'Fat', 'Yo Momma',
+    ...                          '99.2',hoary, hoary.owner)
+    >>> humpy_i386 = humpy.newArch('i386', hoary['i386'].processorfamily,
+    ...                            True, humpy.owner)
+    >>> humpy.nominatedarchindep = humpy_i386
+    >>> humpy.initialiseFromParent()
+    >>> len(hoary.getPublishedReleases('pmount'))
+    1
+    >>> len(humpy.getPublishedReleases('pmount'))
+    1
+    >>> len(hoary['i386'].getReleasedPackages('pmount'))
+    1
+    >>> len(humpy_i386.getReleasedPackages('pmount'))
+    1
 
 Check if the attributes of an DRSPR instance for the just initialised
 distroseries are sane. A DRSPR instance should filter attributes of
@@ -344,42 +346,42 @@
 Initialise a new distroseries based on warty (since it has, at least
 one coherent published source + binary, mozilla-firefox)
 
-   >>> bumpy = ubuntu.newSeries('bumpy', 'Bumpy',
-   ...                          'The Bumpy', 'Fat', 'Boom',
-   ...                          '99.3', warty, warty.owner)
+    >>> bumpy = ubuntu.newSeries('bumpy', 'Bumpy',
+    ...                          'The Bumpy', 'Fat', 'Boom',
+    ...                          '99.3', warty, warty.owner)
 
-   >>> bumpy_i386 = bumpy.newArch('i386', warty['i386'].processorfamily,
-   ...                            True, bumpy.owner)
-   >>> bumpy.nominatedarchindep = bumpy_i386
-   >>> bumpy.initialiseFromParent()
+    >>> bumpy_i386 = bumpy.newArch('i386', warty['i386'].processorfamily,
+    ...                            True, bumpy.owner)
+    >>> bumpy.nominatedarchindep = bumpy_i386
+    >>> bumpy.initialiseFromParent()
 
 Build a new ISourcePackage based in the new distroseries:
 
-   >>> bumpy_firefox_sp = bumpy.getSourcePackage('mozilla-firefox')
+    >>> bumpy_firefox_sp = bumpy.getSourcePackage('mozilla-firefox')
 
 Check the content IDRSPR binaries & builds attributes:
 
 'binaries' should be inherited from parent release.
 
-   >>> bumpy_firefox_sp.currentrelease.binaries.count()
-   2
+    >>> bumpy_firefox_sp.currentrelease.binaries.count()
+    2
 
-   >>> for bin in bumpy_firefox_sp.currentrelease.binaries:
-   ...     print bin.id, bin.title, bin.build.distro_arch_series.title
-   27 mozilla-firefox-data-0.9 The Warty Warthog Release for i386 (x86)
-   12 mozilla-firefox-0.9 The Warty Warthog Release for i386 (x86)
+    >>> for bin in bumpy_firefox_sp.currentrelease.binaries:
+    ...     print bin.id, bin.title, bin.build.distro_arch_series.title
+    27 mozilla-firefox-data-0.9 The Warty Warthog Release for i386 (x86)
+    12 mozilla-firefox-0.9 The Warty Warthog Release for i386 (x86)
 
 
 'builds' should be empty since it was built in parent (warty), not in this
 distroseries (bumby.
 
-   >>> len(bumpy_firefox_sp.currentrelease.builds)
-   0
+    >>> len(bumpy_firefox_sp.currentrelease.builds)
+    0
 
 the SPR returns all build records for it.
 
-   >>> bumpy_firefox_sp.currentrelease.sourcepackagerelease.builds.count()
-   4
+    >>> bumpy_firefox_sp.currentrelease.sourcepackagerelease.builds.count()
+    4
 
 The new series also has the same packaging links as its parent series.
 
@@ -406,22 +408,22 @@
 You can easily find out what packages are translatable in a
 distribution release:
 
-   >>> translatables = hoary.getTranslatableSourcePackages()
-   >>> for translatable in translatables:
-   ...    print translatable.name
-   evolution
-   mozilla
-   pmount
+    >>> translatables = hoary.getTranslatableSourcePackages()
+    >>> for translatable in translatables:
+    ...    print translatable.name
+    evolution
+    mozilla
+    pmount
 
 Packages can be linked to upstream productseries in specific
 distribution releases. IDistroSeries offers a way to query translatable
 packages that are linked to upstream productseries.
 
-   >>> unlinked_translatables = hoary.getUnlinkedTranslatableSourcePackages()
-   >>> for translatable in unlinked_translatables:
-   ...    print translatable.name
-   pmount
-   mozilla
+    >>> unlinked_translatables = hoary.getUnlinkedTranslatableSourcePackages()
+    >>> for translatable in unlinked_translatables:
+    ...    print translatable.name
+    pmount
+    mozilla
 
 The links to upstream product series can be verified using the
 packagings property:
@@ -457,11 +459,11 @@
     linux-source-2.6.15  0  0
 
 
-The distroseries getPrioritizedlPackagings() method that returns a prioritized
+The distroseries getPrioritizedPackagings() method that returns a prioritized
 list of `IPackaging` that need more information about the upstream project to
 share bugs, translations, and code.
 
-    >>> for packaging in hoary.getPrioritizedlPackagings():
+    >>> for packaging in hoary.getPrioritizedPackagings():
     ...     print packaging.sourcepackagename.name
     netapplet
     evolution
@@ -502,109 +504,109 @@
 DistroSeries can build meta objects for packages
 ------------------------------------------------
 
-   >>> from canonical.launchpad.interfaces import (
-   ...     ISourcePackage,
-   ...     IDistroSeriesBinaryPackage,
-   ...     IDistroSeriesSourcePackageRelease)
-
-   >>> pmount_src_name = SourcePackageName.byName('pmount')
-   >>> pmount_source = hoary.getSourcePackage(pmount_src_name)
-   >>> ISourcePackage.providedBy(pmount_source)
-   True
-
-   >>> from lp.soyuz.model.binarypackagename import (
-   ...                                       BinaryPackageName)
-   >>> pmount_bin_name = BinaryPackageName.byName('pmount')
-   >>> pmount_drbp = hoary.getBinaryPackage(pmount_bin_name)
-   >>> IDistroSeriesBinaryPackage.providedBy(pmount_drbp)
-   True
-   >>> len(pmount_drbp.current_publishings)
-   3
-
-   >>> from lp.soyuz.model.sourcepackagerelease import (
-   ...                                           SourcePackageRelease)
-   >>> pmount_rel = SourcePackageRelease.selectOneBy(
-   ...     sourcepackagenameID=pmount_src_name.id, version='0.1-1')
-   >>> pmount_rel.sourcepackagename.name
-   u'pmount'
-
-   >>> pmount_srcrel = hoary.getSourcePackageRelease(pmount_rel)
-   >>> IDistroSeriesSourcePackageRelease.providedBy(pmount_srcrel)
-   True
+    >>> from canonical.launchpad.interfaces import (
+    ...     ISourcePackage,
+    ...     IDistroSeriesBinaryPackage,
+    ...     IDistroSeriesSourcePackageRelease)
+
+    >>> pmount_src_name = SourcePackageName.byName('pmount')
+    >>> pmount_source = hoary.getSourcePackage(pmount_src_name)
+    >>> ISourcePackage.providedBy(pmount_source)
+    True
+
+    >>> from lp.soyuz.model.binarypackagename import (
+    ...                                       BinaryPackageName)
+    >>> pmount_bin_name = BinaryPackageName.byName('pmount')
+    >>> pmount_drbp = hoary.getBinaryPackage(pmount_bin_name)
+    >>> IDistroSeriesBinaryPackage.providedBy(pmount_drbp)
+    True
+    >>> len(pmount_drbp.current_publishings)
+    3
+
+    >>> from lp.soyuz.model.sourcepackagerelease import (
+    ...                                           SourcePackageRelease)
+    >>> pmount_rel = SourcePackageRelease.selectOneBy(
+    ...     sourcepackagenameID=pmount_src_name.id, version='0.1-1')
+    >>> pmount_rel.sourcepackagename.name
+    u'pmount'
+
+    >>> pmount_srcrel = hoary.getSourcePackageRelease(pmount_rel)
+    >>> IDistroSeriesSourcePackageRelease.providedBy(pmount_srcrel)
+    True
 
 Check some properties of DRSPR meta class
 
 Entire publishing history:
 
-   >>> pmount_srcrel.publishing_history.count()
-   1
+    >>> pmount_srcrel.publishing_history.count()
+    1
 
 Most recent published history row:
 
-   >>> pmount_srcrel.current_published is None
-   True
-
-   >>> netapplet_srcrel =  hoary.getSourcePackage('netapplet').currentrelease
-   >>> spph = netapplet_srcrel.current_published
-
-   >>> spph.section.name
-   u'web'
+    >>> pmount_srcrel.current_published is None
+    True
+
+    >>> netapplet_srcrel =  hoary.getSourcePackage('netapplet').currentrelease
+    >>> spph = netapplet_srcrel.current_published
+
+    >>> spph.section.name
+    u'web'
 
 The changesfile attribute contains the package changelog. It is provided as
 an ILibraryFileAlias:
 
-   >>> firefox_srcrel =  warty.getSourcePackage(
-   ...    'mozilla-firefox').currentrelease
-   >>> print firefox_srcrel.title
-   "mozilla-firefox" 0.9 source package in The Warty Warthog Release
+    >>> firefox_srcrel =  warty.getSourcePackage(
+    ...    'mozilla-firefox').currentrelease
+    >>> print firefox_srcrel.title
+    "mozilla-firefox" 0.9 source package in The Warty Warthog Release
 
-   >>> firefox_srcrel.changesfile
-   <LibraryFileAlias at ...>
+    >>> firefox_srcrel.changesfile
+    <LibraryFileAlias at ...>
 
 If the package changelog is not available, that attribute is None:
 
-   >>> netapplet_srcrel.changesfile is None
-   True
+    >>> netapplet_srcrel.changesfile is None
+    True
 
 Perform `post publication` override:
 
-   >>> new_section = getUtility(ISectionSet)['base']
-
-   >>> override = netapplet_srcrel.current_published.changeOverride(
-   ...     new_section=new_section)
-
-   >>> override.section == new_section
-   True
-
-   >>> print override.status.name
-   PENDING
-
-   >>> netapplet_srcrel.publishing_history.count()
-   2
+    >>> new_section = getUtility(ISectionSet)['base']
+
+    >>> override = netapplet_srcrel.current_published.changeOverride(
+    ...     new_section=new_section)
+
+    >>> override.section == new_section
+    True
+
+    >>> print override.status.name
+    PENDING
+
+    >>> netapplet_srcrel.publishing_history.count()
+    2
 
 Override information about 'pmount' is pending publication:
 
-   >>> print netapplet_srcrel.current_published.status.name
-   PENDING
+    >>> print netapplet_srcrel.current_published.status.name
+    PENDING
 
-   >>> print netapplet_srcrel.current_published.section.name
-   base
+    >>> print netapplet_srcrel.current_published.section.name
+    base
 
 Supersede previous netapplet publication:
 
-   >>> last_published = netapplet_srcrel.publishing_history[1]
-   >>> last_published.supersede()
-   >>> flush_database_updates()
-
-   >>> netapplet_srcrel.publishing_history.count()
-   2
-
-   >>> print last_published.status.name
-   SUPERSEDED
-
-   >>> from canonical.database.sqlbase import get_transaction_timestamp
-   >>> last_published.datesuperseded == get_transaction_timestamp()
-   True
+    >>> last_published = netapplet_srcrel.publishing_history[1]
+    >>> last_published.supersede()
+    >>> flush_database_updates()
+
+    >>> netapplet_srcrel.publishing_history.count()
+    2
+
+    >>> print last_published.status.name
+    SUPERSEDED
+
+    >>> from canonical.database.sqlbase import get_transaction_timestamp
+    >>> last_published.datesuperseded == get_transaction_timestamp()
+    True
 
 
 SourcePackagePublishingHistory
@@ -616,114 +618,114 @@
 instance. it can also be used to generate the archive packages list in
 the future.
 
-   >>> ubuntu = getUtility(IDistributionSet)['ubuntu']
-   >>> hoary = ubuntu['hoary']
-
-   >>> from canonical.launchpad.interfaces import (
-   ...    PackagePublishingStatus)
-
-   >>> hoary_pub_sources = hoary.getSourcePackagePublishing(
-   ...     PackagePublishingStatus.PUBLISHED,
-   ...     PackagePublishingPocket.RELEASE)
-
-   >>> hoary_pub_sources.count()
-   6
-
-   >>> for pub in hoary_pub_sources:
-   ...     print pub.displayname
-   alsa-utils 1.0.9a-4ubuntu1 in hoary
-   cnews cr.g7-37 in hoary
-   evolution 1.0 in hoary
-   libstdc++ b8p in hoary
-   linux-source-2.6.15 2.6.15.3 in hoary
-   pmount 0.1-2 in hoary
-
-   >>> hoary_pub_source = hoary_pub_sources[0]
-
-   >>> hoary_pub_source.sourcepackagerelease.name
-   u'alsa-utils'
-
-   >>> hoary_pub_source.sourcepackagerelease.version
-   u'1.0.9a-4ubuntu1'
-
-   >>> hoary_pub_source.component.name
-   u'main'
-
-   >>> hoary_pub_source.section.name
-   u'base'
-
-   >>> hoary.getSourcePackagePublishing(
-   ...     PackagePublishingStatus.PUBLISHED,
-   ...     PackagePublishingPocket.UPDATES).count()
-   0
+    >>> ubuntu = getUtility(IDistributionSet)['ubuntu']
+    >>> hoary = ubuntu['hoary']
+
+    >>> from canonical.launchpad.interfaces import (
+    ...    PackagePublishingStatus)
+
+    >>> hoary_pub_sources = hoary.getSourcePackagePublishing(
+    ...     PackagePublishingStatus.PUBLISHED,
+    ...     PackagePublishingPocket.RELEASE)
+
+    >>> hoary_pub_sources.count()
+    6
+
+    >>> for pub in hoary_pub_sources:
+    ...     print pub.displayname
+    alsa-utils 1.0.9a-4ubuntu1 in hoary
+    cnews cr.g7-37 in hoary
+    evolution 1.0 in hoary
+    libstdc++ b8p in hoary
+    linux-source-2.6.15 2.6.15.3 in hoary
+    pmount 0.1-2 in hoary
+
+    >>> hoary_pub_source = hoary_pub_sources[0]
+
+    >>> hoary_pub_source.sourcepackagerelease.name
+    u'alsa-utils'
+
+    >>> hoary_pub_source.sourcepackagerelease.version
+    u'1.0.9a-4ubuntu1'
+
+    >>> hoary_pub_source.component.name
+    u'main'
+
+    >>> hoary_pub_source.section.name
+    u'base'
+
+    >>> hoary.getSourcePackagePublishing(
+    ...     PackagePublishingStatus.PUBLISHED,
+    ...     PackagePublishingPocket.UPDATES).count()
+    0
 
 This method also allow us to restrict the results to a given
 component:
 
-   >>> component_main = getUtility(IComponentSet)['main']
-   >>> hoary.getSourcePackagePublishing(
-   ...     PackagePublishingStatus.PUBLISHED,
-   ...     PackagePublishingPocket.RELEASE,
-   ...     component=component_main).count()
-   5
+    >>> component_main = getUtility(IComponentSet)['main']
+    >>> hoary.getSourcePackagePublishing(
+    ...     PackagePublishingStatus.PUBLISHED,
+    ...     PackagePublishingPocket.RELEASE,
+    ...     component=component_main).count()
+    5
 
-   >>> component_multiverse = getUtility(IComponentSet)['multiverse']
-   >>> hoary.getSourcePackagePublishing(
-   ...     PackagePublishingStatus.PUBLISHED,
-   ...     PackagePublishingPocket.RELEASE,
-   ...     component=component_multiverse).count()
-   0
+    >>> component_multiverse = getUtility(IComponentSet)['multiverse']
+    >>> hoary.getSourcePackagePublishing(
+    ...     PackagePublishingStatus.PUBLISHED,
+    ...     PackagePublishingPocket.RELEASE,
+    ...     component=component_multiverse).count()
+    0
 
 By default the IDistribution 'main_archive' is considered, but It also
 allows the callsite to specify one and then the result will be
 restricted to it.
 
-   >>> debian_archive = getUtility(IDistributionSet)['debian'].main_archive
-   >>> print debian_archive.purpose.title
-   Primary Archive
+    >>> debian_archive = getUtility(IDistributionSet)['debian'].main_archive
+    >>> print debian_archive.purpose.title
+    Primary Archive
 
-   >>> hoary.getSourcePackagePublishing(
-   ...     PackagePublishingStatus.PUBLISHED,
-   ...     PackagePublishingPocket.RELEASE,
-   ...     component=component_main, archive=debian_archive).count()
-   0
+    >>> hoary.getSourcePackagePublishing(
+    ...     PackagePublishingStatus.PUBLISHED,
+    ...     PackagePublishingPocket.RELEASE,
+    ...     component=component_main, archive=debian_archive).count()
+    0
 
 ISPP.getPublishedBinaries returns all the binaries generated by the
 publication in question:
 
-   >>> warty = ubuntu['warty']
-   >>> warty_pub_sources = warty.getSourcePackagePublishing(
-   ...     PackagePublishingStatus.PUBLISHED,
-   ...     PackagePublishingPocket.RELEASE)
-
-   >>> warty_pub_source = warty_pub_sources[4]
-   >>> warty_pub_source.sourcepackagerelease.name
-   u'mozilla-firefox'
-   >>> warty_pub_source.sourcepackagerelease.version
-   u'0.9'
-   >>> warty_pub_source.component.name
-   u'main'
-   >>> warty_pub_source.section.name
-   u'web'
-
-   >>> warty_mozilla_pub_binaries = warty_pub_source.getPublishedBinaries()
-   >>> len(warty_mozilla_pub_binaries)
-   4
-   >>> warty_mozilla_pub_bin = warty_mozilla_pub_binaries[0]
-
-   >>> from canonical.launchpad.interfaces import (
-   ...    IBinaryPackagePublishingHistory)
-   >>> verifyObject(IBinaryPackagePublishingHistory, warty_mozilla_pub_bin)
-   True
-
-   >>> warty_mozilla_pub_bin.binarypackagerelease.name
-   u'mozilla-firefox'
-   >>> warty_mozilla_pub_bin.binarypackagerelease.version
-   u'0.9'
-   >>> warty_mozilla_pub_bin.component.name
-   u'main'
-   >>> warty_mozilla_pub_bin.section.name
-   u'base'
+    >>> warty = ubuntu['warty']
+    >>> warty_pub_sources = warty.getSourcePackagePublishing(
+    ...     PackagePublishingStatus.PUBLISHED,
+    ...     PackagePublishingPocket.RELEASE)
+
+    >>> warty_pub_source = warty_pub_sources[4]
+    >>> warty_pub_source.sourcepackagerelease.name
+    u'mozilla-firefox'
+    >>> warty_pub_source.sourcepackagerelease.version
+    u'0.9'
+    >>> warty_pub_source.component.name
+    u'main'
+    >>> warty_pub_source.section.name
+    u'web'
+
+    >>> warty_mozilla_pub_binaries = warty_pub_source.getPublishedBinaries()
+    >>> len(warty_mozilla_pub_binaries)
+    4
+    >>> warty_mozilla_pub_bin = warty_mozilla_pub_binaries[0]
+
+    >>> from canonical.launchpad.interfaces import (
+    ...    IBinaryPackagePublishingHistory)
+    >>> verifyObject(IBinaryPackagePublishingHistory, warty_mozilla_pub_bin)
+    True
+
+    >>> warty_mozilla_pub_bin.binarypackagerelease.name
+    u'mozilla-firefox'
+    >>> warty_mozilla_pub_bin.binarypackagerelease.version
+    u'0.9'
+    >>> warty_mozilla_pub_bin.component.name
+    u'main'
+    >>> warty_mozilla_pub_bin.section.name
+    u'base'
 
 DistroSeries.getBinaryPackagePublishing will return
 BinaryPackagePublishingHistory objects for the DistroSeries:
 
=== modified file 'lib/lp/registry/interfaces/distroseries.py'
--- lib/lp/registry/interfaces/distroseries.py	2010-06-08 15:58:04 +0000
+++ lib/lp/registry/interfaces/distroseries.py	2010-07-28 19:11:08 +0000
@@ -414,7 +414,7 @@
         and total_messages (translatable messages).
         """
 
-    def getPrioritizedlPackagings():
+    def getPrioritizedPackagings():
         """Return a list of packagings that need more upstream information."""
 
     def getMostRecentlyLinkedPackagings():
@@ -514,15 +514,16 @@
 
         If version is not specified, return packages with any version.
 
-        if exclude_pocket is specified we exclude results matching that pocket.
+        If exclude_pocket is specified we exclude results matching that
+        pocket.
 
         If 'include_pending' is True, we return also the pending publication
         records, those packages that will get published in the next publisher
         run (it's only useful when we need to know if a given package is
         known during a publisher run, mostly in pre-upload checks)
 
-        If 'archive' is not specified consider publication in the main_archive,
-        otherwise respect the given value.
+        If 'archive' is not specified consider publication in the
+        main_archive, otherwise respect the given value.
         """
 
     def getAllPublishedSources():
 
=== modified file 'lib/lp/registry/model/distroseries.py'
--- lib/lp/registry/model/distroseries.py	2010-07-15 15:01:18 +0000
+++ lib/lp/registry/model/distroseries.py	2010-07-28 19:11:08 +0000
@@ -19,7 +19,7 @@
     BoolCol, StringCol, ForeignKey, SQLMultipleJoin, IntCol,
     SQLObjectNotFound, SQLRelatedJoin)
 
-from storm.locals import And, Desc, Join, SQL
+from storm.locals import Desc, Join, SQL
 from storm.store import Store
 
 from zope.component import getUtility
@@ -335,14 +335,19 @@
         condition = SQL(conditions + "AND packaging.id IS NULL")
         results = IStore(self).using(origin).find(find_spec, condition)
         results = results.order_by('score DESC', SourcePackageName.name)
-        return [{
-                 'package': SourcePackage(
+        results = results.config(distinct=True)
+
+        def decorator(result):
+            spn, score, bug_count, total_messages = result
+            return {
+                'package': SourcePackage(
                     sourcepackagename=spn, distroseries=self),
-                 'bug_count': bug_count,
-                 'total_messages': total_messages}
-                for (spn, score, bug_count, total_messages) in results]
+                'bug_count': bug_count,
+                'total_messages': total_messages,
+                }
+        return DecoratedResultSet(results, decorator)
 
-    def getPrioritizedlPackagings(self):
+    def getPrioritizedPackagings(self):
         """See `IDistroSeries`.
 
         The prioritization is a heuristic rule using the branch, bug heat,
@@ -352,18 +357,6 @@
         # the objects that are implcitly needed to work with a
         # Packaging object.
         # Avoid circular import failures.
-        from lp.registry.model.product import Product
-        from lp.registry.model.productseries import ProductSeries
-        find_spec = (
-            Packaging, SourcePackageName, ProductSeries, Product,
-            SQL("""
-                CASE WHEN spr.component = 1 THEN 1000 ELSE 0 END +
-                    CASE WHEN Product.bugtracker IS NULL
-                        THEN coalesce(total_bug_heat, 10) ELSE 0 END +
-                    CASE WHEN ProductSeries.translations_autoimport_mode = 1
-                        THEN coalesce(po_messages, 10) ELSE 0 END +
-                    CASE WHEN ProductSeries.branch IS NULL THEN 500
-                        ELSE 0 END AS score"""))
         joins, conditions = self._current_sourcepackage_joins_and_conditions
         origin = SQL(joins + """
             JOIN ProductSeries
@@ -372,10 +365,19 @@
                 ON ProductSeries.product = Product.id
             """)
         condition = SQL(conditions + "AND packaging.id IS NOT NULL")
-        results = IStore(self).using(origin).find(find_spec, condition)
-        results = results.order_by('score DESC, SourcePackageName.name ASC')
-        return [packaging
-                for (packaging, spn, series, product, score) in results]
+        results = IStore(self).using(origin).find(Packaging, condition)
+        return results.order_by("""
+            (
+                CASE WHEN spr.component = 1 THEN 1000 ELSE 0 END
+                + CASE WHEN Product.bugtracker IS NULL
+                    THEN coalesce(total_bug_heat, 10) ELSE 0 END
+                + CASE WHEN ProductSeries.translations_autoimport_mode = 1
+                    THEN coalesce(po_messages, 10) ELSE 0 END
+                + CASE WHEN ProductSeries.branch IS NULL THEN 500
+                    ELSE 0 END
+            ) DESC,
+            SourcePackageName.name ASC
+            """)
 
     @property
     def _current_sourcepackage_joins_and_conditions(self):
 
=== modified file 'lib/lp/registry/stories/distroseries/xx-distroseries-index.txt'
--- lib/lp/registry/stories/distroseries/xx-distroseries-index.txt	2010-02-26 19:18:37 +0000
+++ lib/lp/registry/stories/distroseries/xx-distroseries-index.txt	2010-07-28 19:11:08 +0000
@@ -100,4 +100,9 @@
     evolution linked...
     mozilla-firefox linked...
     netapplet linked 2005-07-05
-    Needs upstream links  All upstream links
+    Needs more information or linking to upstream:
+    cdrkit
+    iceweasel
+    linux-source-2.6.15
+    Needs upstream links
+    All upstream links
 
=== modified file 'lib/lp/registry/templates/distroseries-portlet-packaging.pt'
--- lib/lp/registry/templates/distroseries-portlet-packaging.pt	2010-05-27 04:10:17 +0000
+++ lib/lp/registry/templates/distroseries-portlet-packaging.pt	2010-07-28 19:11:08 +0000
@@ -56,7 +56,7 @@
     </dt>
     <dd tal:condition="view/needs_linking">
       <ul class="horizontal">
-          <li repeat="package view/needs_linking">
+          <li tal:repeat="package view/needs_linking">
             <a class="sprite package-source"
                tal:attributes="href package/package/fmt:url"
                tal:content="package/package/name">evolution</a>
 
=== modified file 'lib/lp/registry/tests/test_distroseries.py'
--- lib/lp/registry/tests/test_distroseries.py	2010-07-20 17:50:45 +0000
+++ lib/lp/registry/tests/test_distroseries.py	2010-07-28 19:11:08 +0000
@@ -271,17 +271,17 @@
             u'main', u'hot-translatable', u'hot', u'translatable', u'normal']
         self.assertEqual(expected, names)
 
-    def test_getPrioritizedlPackagings(self):
+    def test_getPrioritizedPackagings(self):
         # Verify the ordering of packagings that need more upstream info.
         for name in ['main', 'hot-translatable', 'hot', 'translatable']:
             self.linkPackage(name)
-        packagings = self.series.getPrioritizedlPackagings()
+        packagings = self.series.getPrioritizedPackagings()
         names = [packaging.sourcepackagename.name for packaging in packagings]
         expected = [
             u'main', u'hot-translatable', u'hot', u'translatable', u'linked']
         self.assertEqual(expected, names)
 
-    def test_getPrioritizedlPackagings_bug_tracker(self):
+    def test_getPrioritizedPackagings_bug_tracker(self):
         # Verify the ordering of packagings with and without a bug tracker.
         self.linkPackage('hot')
         self.makeSeriesPackage('cold')
@@ -289,12 +289,12 @@
         naked_product_series = remove_security_proxy_and_shout_at_engineer(
             product_series)
         naked_product_series.product.bugtraker = self.factory.makeBugTracker()
-        packagings = self.series.getPrioritizedlPackagings()
+        packagings = self.series.getPrioritizedPackagings()
         names = [packaging.sourcepackagename.name for packaging in packagings]
         expected = [u'hot', u'cold', u'linked']
         self.assertEqual(expected, names)
 
-    def test_getPrioritizedlPackagings_branch(self):
+    def test_getPrioritizedPackagings_branch(self):
         # Verify the ordering of packagings with and without a branch.
         self.linkPackage('translatable')
         self.makeSeriesPackage('withbranch')
@@ -302,12 +302,12 @@
         naked_product_series = remove_security_proxy_and_shout_at_engineer(
             product_series)
         naked_product_series.branch = self.factory.makeBranch()
-        packagings = self.series.getPrioritizedlPackagings()
+        packagings = self.series.getPrioritizedPackagings()
         names = [packaging.sourcepackagename.name for packaging in packagings]
         expected = [u'translatable', u'linked', u'withbranch']
         self.assertEqual(expected, names)
 
-    def test_getPrioritizedlPackagings_translation(self):
+    def test_getPrioritizedPackagings_translation(self):
         # Verify the ordering of translatable packagings that are and are not
         # configured to import.
         self.linkPackage('translatable')
@@ -318,7 +318,7 @@
         naked_product_series.branch = self.factory.makeBranch()
         naked_product_series.translations_autoimport_mode = (
             TranslationsBranchImportMode.IMPORT_TEMPLATES)
-        packagings = self.series.getPrioritizedlPackagings()
+        packagings = self.series.getPrioritizedPackagings()
         names = [packaging.sourcepackagename.name for packaging in packagings]
         expected = [u'translatable', u'linked', u'importabletranslatable']
         self.assertEqual(expected, names)