Merge lp:~cjwatson/launchpad/bpb-source-package-name into lp:launchpad

[Colin Watson]

Add an exported variant of BinaryPackageBuild.source_package_name, making it easier to cope with cases where a build's SPPH is invisible.

Add an exported variant of BinaryPackageBuild.source_package_name, making it easier to cope with cases where a build's SPPH is invisible. This will let us fix (or at least work around) a 401 that's biting ddeb-retriever.

[William Grant (wgrant)]

review: Approve (code)

=== modified file 'lib/lp/soyuz/interfaces/binarypackagebuild.py'
--- lib/lp/soyuz/interfaces/binarypackagebuild.py	2015-04-20 09:48:57 +0000
+++ lib/lp/soyuz/interfaces/binarypackagebuild.py	2015-05-12 01:44:16 +0000
@@ -98,6 +98,10 @@
             schema=ISourcePackagePublishingHistory,
             required=False, readonly=True,
             description=_("The current source publication for this build.")))
+    api_source_package_name = exported(
+        TextLine(
+            title=_("Source package name"), required=False, readonly=True),
+        exported_as="source_package_name")
 
     distro_series = Attribute("Direct parent needed by CanonicalURL")
     arch_tag = exported(

=== modified file 'lib/lp/soyuz/model/binarypackagebuild.py'
--- lib/lp/soyuz/model/binarypackagebuild.py	2015-04-08 10:35:22 +0000
+++ lib/lp/soyuz/model/binarypackagebuild.py	2015-05-12 01:44:16 +0000
@@ -248,6 +248,11 @@
         return None
 
     @property
+    def api_source_package_name(self):
+        """See `IBuild`."""
+        return self.source_package_release.name
+
+    @property
     def upload_changesfile(self):
         """See `IBuild`"""
         package_upload = self.package_upload

=== modified file 'lib/lp/soyuz/stories/webservice/xx-builds.txt'
--- lib/lp/soyuz/stories/webservice/xx-builds.txt	2014-07-24 09:37:03 +0000
+++ lib/lp/soyuz/stories/webservice/xx-builds.txt	2015-05-12 01:44:16 +0000
@@ -60,6 +60,7 @@
     resource_type_link: u'http://api.launchpad.dev/beta/#build'
     score: None
     self_link: u'http://api.launchpad.dev/beta/~cprov/+archive/ubuntu/ppa/+build/26'
+    source_package_name: u'cdrkit'
     status: u'Failed to build'
     title: u'i386 build of cdrkit 1.0 in ubuntu breezy-autotest RELEASE'
     upload_log_url: None
@@ -92,6 +93,7 @@
     resource_type_link: u'http://.../#build'
     score: None
     self_link: u'http://.../~cprov/+archive/ubuntu/ppa/+build/26'
+    source_package_name: u'cdrkit'
     title: u'i386 build of cdrkit 1.0 in ubuntu breezy-autotest RELEASE'
     upload_log_url: None
     web_link: u'http://launchpad.../~cprov/+archive/ubuntu/ppa/+build/26'
@@ -124,6 +126,7 @@
     resource_type_link: u'http://.../#build'
     score: None
     self_link: u'http://.../~cprov/+archive/ubuntu/ppa/+build/26'
+    source_package_name: u'cdrkit'
     title: u'i386 build of cdrkit 1.0 in ubuntu breezy-autotest RELEASE'
     upload_log_url: None
     web_link: u'http://launchpad.../~cprov/+archive/ubuntu/ppa/+build/26'

=== modified file 'lib/lp/soyuz/tests/test_binarypackagebuild.py'
--- lib/lp/soyuz/tests/test_binarypackagebuild.py	2015-04-08 10:35:22 +0000
+++ lib/lp/soyuz/tests/test_binarypackagebuild.py	2015-05-12 01:44:16 +0000
@@ -501,6 +501,13 @@
         entry = self.webservice.get(build_url, api_version='devel').jsonBody()
         self.assertEndsWith(entry['builder_link'], builder_url)
 
+    def test_source_package_name(self):
+        name = self.build.source_package_release.name
+        build_url = api_url(self.build)
+        logout()
+        entry = self.webservice.get(build_url, api_version='devel').jsonBody()
+        self.assertEqual(name, entry['source_package_name'])
+
 
 class TestPostprocessCandidate(TestCaseWithFactory):