launchpad-reviewers team mailing list archive

[Robert Collins <robertc@xxxxxxxxxxxxxxxxx>]

Robert Collins has proposed merging lp:~lifeless/launchpad/bug-618372 into lp:launchpad/devel.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)


Tiny tweak to localise the use of a table in Distribution._binarySearchClause (only one call site wants it).
-- 
https://code.launchpad.net/~lifeless/launchpad/bug-618372/+merge/34383
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~lifeless/launchpad/bug-618372 into lp:launchpad/devel.

=== modified file 'lib/lp/registry/model/distribution.py'
--- lib/lp/registry/model/distribution.py	2010-08-31 05:58:45 +0000
+++ lib/lp/registry/model/distribution.py	2010-09-02 05:35:55 +0000
@@ -1241,7 +1241,6 @@
         return (
             DistroSeries.distribution == self,
             DistroSeries.status != SeriesStatus.OBSOLETE,
-            BinaryPackageRelease.binarypackagename == BinaryPackageName.id,
             DistroArchSeries.distroseries == DistroSeries.id,
             BinaryPackageBuild.distro_arch_series == DistroArchSeries.id,
             BinaryPackageRelease.build == BinaryPackageBuild.id,
@@ -1261,7 +1260,9 @@
         select_spec = (DistributionSourcePackageCache,)
 
         if exact_match:
-            find_spec = self._binaryPackageSearchClause
+            find_spec = self._binaryPackageSearchClause + (
+                BinaryPackageRelease.binarypackagename == BinaryPackageName.id,
+                )
             match_clause = (BinaryPackageName.name == package_name,)
         else:
             # In this case we can use a simplified find-spec as the