Merge lp:~stevenk/launchpad/fixes-bug-552560 into lp:launchpad

[Steve Kowalik]

This branch changes the Origin and Label for the partner archive so that Ubuntu Software Centre can better show users which software comes from the partner archive on archive.canonical.com

[Jelmer Vernooij (jelmer)]

The only minor issue I see is that your comments are lacking dots at the end of the sentences.

review: Approve (code)

=== modified file 'lib/lp/archivepublisher/publishing.py'
--- lib/lp/archivepublisher/publishing.py	2010-04-22 12:02:06 +0000
+++ lib/lp/archivepublisher/publishing.py	2010-06-10 08:24:33 +0000
@@ -428,6 +428,8 @@
         """
         if self.archive.is_ppa:
             return self.archive.displayname
+        elif self.archive.purpose == ArchivePurpose.PARTNER:
+            return "Partner archive"
         else:
             return self.distro.displayname
 
@@ -443,6 +445,8 @@
         """
         # XXX al-maisan, 2008-11-19, bug=299981. If this file is released
         # from a copy archive then modify the origin to indicate so.
+        if self.archive.purpose == ArchivePurpose.PARTNER:
+            return "Canonical"
         if not self.archive.is_ppa:
             return self.distro.displayname
         return "LP-PPA-%s" % get_ppa_reference(self.archive)

=== modified file 'lib/lp/archivepublisher/tests/test_publisher.py'
--- lib/lp/archivepublisher/tests/test_publisher.py	2010-06-08 14:03:59 +0000
+++ lib/lp/archivepublisher/tests/test_publisher.py	2010-06-10 08:24:33 +0000
@@ -1040,6 +1040,19 @@
         self.assertTrue('Sources.gz\n' in stringified_contents)
         self.assertTrue('Sources\n' in stringified_contents)
 
+        # Partner archive architecture Release files 'Origin' contain
+        # a string
+        arch_release_file = os.path.join(
+            publisher._config.distsroot, 'breezy-autotest',
+            'partner/source/Release')
+        arch_release_contents = open(arch_release_file).read()
+        self.assertEqual(
+            self._getReleaseFileOrigin(arch_release_contents),
+            'Canonical')
+        
+        # The Label: field should be set to the archive displayname
+        self.assertEqual(release_contents[1], 'Label: Partner archive')
+
     def testWorldAndGroupReadablePackagesAndSources(self):
         """Test Packages.gz and Sources.gz files are world and group readable.