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

[Steve Kowalik]

Also copy custom upload files from the restricted librarian to the unrestricted librarian when doing delayed copies.

This branch enables copying of custom upload files from the restricted librarian to the unrestricted librarian when doing delayed copies, and updates the test to exercise that.

[Eleanor Berger (intellectronica)]

1. Please sort the imports alphabetically.
2. assertEquals(False... --> assertFalse.

Other than that it's all good.

review: Approve (code)

=== modified file 'lib/lp/soyuz/configure.zcml'
--- lib/lp/soyuz/configure.zcml	2010-03-11 22:15:29 +0000
+++ lib/lp/soyuz/configure.zcml	2010-03-24 07:10:05 +0000
@@ -225,6 +225,8 @@
         class="canonical.launchpad.database.PackageUploadCustom">
         <allow
             interface="lp.soyuz.interfaces.queue.IPackageUploadCustom"/>
+        <require
+            permission="launchpad.Admin" set_attributes="libraryfilealias"/>
     </class>
 
     <!-- PackageUploadSet -->

=== modified file 'lib/lp/soyuz/model/queue.py'
--- lib/lp/soyuz/model/queue.py	2010-03-18 20:32:12 +0000
+++ lib/lp/soyuz/model/queue.py	2010-03-24 07:10:05 +0000
@@ -612,6 +612,11 @@
                 for new_file in update_files_privacy(pub_record):
                     debug(logger,
                           "Re-uploaded %s to librarian" % new_file.filename)
+                for custom_file in self.customfiles:
+                    update_files_privacy(custom_file)
+                    debug(logger,
+                          "Re-uploaded custom file %s to librarian" %
+                          new_file.filename)
                 if ISourcePackagePublishingHistory.providedBy(pub_record):
                     pas_verify = BuildDaemonPackagesArchSpecific(
                         config.builddmaster.root, self.distroseries)

=== modified file 'lib/lp/soyuz/scripts/packagecopier.py'
--- lib/lp/soyuz/scripts/packagecopier.py	2010-03-06 04:57:40 +0000
+++ lib/lp/soyuz/scripts/packagecopier.py	2010-03-24 07:10:05 +0000
@@ -32,7 +32,8 @@
 from lp.soyuz.interfaces.publishing import (
     IBinaryPackagePublishingHistory, IPublishingSet,
     ISourcePackagePublishingHistory, active_publishing_status)
-from lp.soyuz.interfaces.queue import IPackageUpload, IPackageUploadSet
+from lp.soyuz.interfaces.queue import (
+    IPackageUpload, IPackageUploadCustom, IPackageUploadSet)
 from lp.soyuz.interfaces.sourcepackageformat import SourcePackageFormat
 from lp.soyuz.scripts.ftpmasterbase import SoyuzScript, SoyuzScriptError
 from lp.soyuz.scripts.processaccepted import close_bugs_for_sourcepublication
@@ -74,7 +75,7 @@
 # XXX cprov 2009-06-12: this function should be incorporated in
 # IPublishing.
 def update_files_privacy(pub_record):
-    """Update file privacy according the publishing detination
+    """Update file privacy according the publishing destination
 
     :param pub_record: One of a SourcePackagePublishingHistory or
         BinaryPackagePublishingHistory record.
@@ -82,7 +83,9 @@
     :return: a list of re-uploaded `LibraryFileAlias` objects.
     """
     package_files = []
+    archive = None
     if ISourcePackagePublishingHistory.providedBy(pub_record):
+        archive = pub_record.archive
         # Re-upload the package files files if necessary.
         sourcepackagerelease = pub_record.sourcepackagerelease
         package_files.extend(
@@ -96,6 +99,7 @@
         package_upload = sourcepackagerelease.package_upload
         package_files.append((package_upload, 'changesfile'))
     elif IBinaryPackagePublishingHistory.providedBy(pub_record):
+        archive = pub_record.archive
         # Re-upload the binary files if necessary.
         binarypackagerelease = pub_record.binarypackagerelease
         package_files.extend(
@@ -107,10 +111,15 @@
         package_files.append((package_upload, 'changesfile'))
         # Re-upload the buildlog file as necessary.
         package_files.append((build, 'buildlog'))
+    elif IPackageUploadCustom.providedBy(pub_record):
+        # Re-upload the custom files included
+        package_files.append((pub_record, 'libraryfilealias'))
+        # And set archive to the right attribute for PUCs
+        archive = pub_record.packageupload.archive
     else:
         raise AssertionError(
-            "pub_record is not one of SourcePackagePublishingHistory "
-            "or BinaryPackagePublishingHistory.")
+            "pub_record is not one of SourcePackagePublishingHistory, "
+            "BinaryPackagePublishingHistory or PackageUploadCustom.")
 
     re_uploaded_files = []
     for obj, attr_name in package_files:
@@ -119,11 +128,11 @@
         # not the opposite. We don't have a use-case for privatizing
         # files yet.
         if (old_lfa is None or
-            old_lfa.restricted == pub_record.archive.private or
+            old_lfa.restricted == archive.private or
             old_lfa.restricted == False):
             continue
         new_lfa = re_upload_file(
-            old_lfa, restricted=pub_record.archive.private)
+            old_lfa, restricted=archive.private)
         setattr(obj, attr_name, new_lfa)
         re_uploaded_files.append(new_lfa)
 

=== modified file 'lib/lp/soyuz/scripts/tests/test_copypackage.py'
--- lib/lp/soyuz/scripts/tests/test_copypackage.py	2010-03-06 04:57:40 +0000
+++ lib/lp/soyuz/scripts/tests/test_copypackage.py	2010-03-24 07:10:05 +0000
@@ -177,8 +177,8 @@
         # or `IBinaryPackagePublishingHistory` objects.
         self.assertRaisesWithContent(
             AssertionError,
-            'pub_record is not one of SourcePackagePublishingHistory '
-            'or BinaryPackagePublishingHistory.',
+            'pub_record is not one of SourcePackagePublishingHistory, '
+            'BinaryPackagePublishingHistory or PackageUploadCustom.',
             update_files_privacy, None)
 
     def assertNewFiles(self, new_files, result):

=== modified file 'lib/lp/soyuz/tests/test_packageupload.py'
--- lib/lp/soyuz/tests/test_packageupload.py	2010-03-17 08:57:02 +0000
+++ lib/lp/soyuz/tests/test_packageupload.py	2010-03-24 07:10:05 +0000
@@ -273,6 +273,10 @@
             'main/dist-upgrader-all')
         self.assertEquals(
             ['20060302.0120', 'current'], sorted(os.listdir(custom_path)))
+        
+        # The custom files were also copied to the public librarian
+        for customfile in delayed_copy.customfiles:
+            self.assertFalse(customfile.libraryfilealias.restricted)
 
     def test_realiseUpload_for_source_only_delayed_copies(self):
         # Source-only delayed-copies results in the source published