Merge lp:~stevenk/launchpad/dsd-base_source_pub-archive into lp:launchpad

[Steve Kowalik]

[r=lifeless,wgrant][no-qa] Look in both the parent and child *archives* when looking for the base source publication.

Don't limit the search for the base version source publication to the parent or child distroseries, look in both archives fully.

[William Grant (wgrant)]

review: Approve (code*)

[Robert Collins (lifeless)]

review: Approve

=== modified file 'lib/lp/registry/model/distroseriesdifference.py'
--- lib/lp/registry/model/distroseriesdifference.py	2011-03-14 06:10:13 +0000
+++ lib/lp/registry/model/distroseriesdifference.py	2011-03-15 02:53:10 +0000
@@ -156,14 +156,14 @@
             parent = self.derived_series.parent_series
             result = parent.main_archive.getPublishedSources(
                 name=self.source_package_name.name,
-                version=self.base_version, distroseries=parent).first()
+                version=self.base_version).first()
             if result is None:
                 # If the base version isn't in the parent, it may be
                 # published in the child distroseries.
                 child = self.derived_series
                 result = child.main_archive.getPublishedSources(
                     name=self.source_package_name.name,
-                    version=self.base_version, distroseries=child).first()
+                    version=self.base_version).first()
             return result
         return None