launchpad-reviewers team mailing list archive

[Julian Edwards <julian.edwards@xxxxxxxxxxxxx>]

Julian Edwards has proposed merging lp:~julian-edwards/launchpad/unembargo-changelogs-bug-757550 into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #757550 in Launchpad itself: "changelog files are not unembargoed with the rest of the source"
  https://bugs.launchpad.net/launchpad/+bug/757550

For more details, see:
https://code.launchpad.net/~julian-edwards/launchpad/unembargo-changelogs-bug-757550/+merge/57182

Make sure changelog files are unembargoed with the rest of a package's files.
-- 
https://code.launchpad.net/~julian-edwards/launchpad/unembargo-changelogs-bug-757550/+merge/57182
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~julian-edwards/launchpad/unembargo-changelogs-bug-757550 into lp:launchpad.

=== modified file 'lib/lp/soyuz/configure.zcml'
--- lib/lp/soyuz/configure.zcml	2011-03-29 09:24:53 +0000
+++ lib/lp/soyuz/configure.zcml	2011-04-11 15:26:52 +0000
@@ -89,6 +89,10 @@
         class="lp.soyuz.model.sourcepackagerelease.SourcePackageRelease">
         <allow
             interface="lp.soyuz.interfaces.sourcepackagerelease.ISourcePackageRelease"/>
+        <!-- changelog needs to be updated when unembargoing -->
+        <require
+            permission="launchpad.Edit"
+            set_attributes="changelog"/>
     </class>
     <facet
         facet="overview">

=== modified file 'lib/lp/soyuz/scripts/packagecopier.py'
--- lib/lp/soyuz/scripts/packagecopier.py	2011-03-06 06:26:38 +0000
+++ lib/lp/soyuz/scripts/packagecopier.py	2011-04-11 15:26:52 +0000
@@ -110,6 +110,7 @@
         # Re-upload the source upload changesfile if necessary.
         package_upload = sourcepackagerelease.package_upload
         package_files.append((package_upload, 'changesfile'))
+        package_files.append((sourcepackagerelease, 'changelog'))
     elif IBinaryPackagePublishingHistory.providedBy(pub_record):
         archive = pub_record.archive
         # Re-upload the binary files if necessary.

=== modified file 'lib/lp/soyuz/scripts/tests/test_copypackage.py'
--- lib/lp/soyuz/scripts/tests/test_copypackage.py	2011-03-03 00:43:44 +0000
+++ lib/lp/soyuz/scripts/tests/test_copypackage.py	2011-04-11 15:26:52 +0000
@@ -2425,6 +2425,11 @@
         for build in ppa_source.getBuilds():
             build.log = fake_buildlog
 
+        # Add a restricted changelog file.
+        fake_changelog = test_publisher.addMockFile(
+            'changelog', restricted=True)
+        ppa_source.sourcepackagerelease.changelog = fake_changelog
+
         # Create ancestry environment in the primary archive, so we can
         # test unembargoed overrides.
         ancestry_source = test_publisher.getPubSource(
@@ -2477,6 +2482,7 @@
             if ISourcePackagePublishingHistory.providedBy(published):
                 source = published.sourcepackagerelease
                 self.assertFalse(source.upload_changesfile.restricted)
+                self.assertFalse(source.changelog.restricted)
                 # Check the source's package diff.
                 [diff] = source.package_diffs
                 self.assertFalse(diff.diff_content.restricted)