Merge lp:~danilo/launchpad/bug-562450 into lp:launchpad

[Данило Шеган]

Do not publish translations for package rebuilds.

= Bug 562450 =

People complain when stuff happens without them being aware of it. One of such things is when translations get imported and attributed to them.

So, we had a rebuild of a package from Intrepid and that ended up causing a translations import. One file had no Last-Translator set, so even translations got assigned to the original packager from few years back. It came as a surprise to the packager.

== Proposed fix ==

From discussion with Julian, we should ignore not just PPAs, but all the packages from archives with purposes not in MAIN_ARCHIVE_PURPOSES. Let's do it.

Lint has a bunch of problems which I am pretty sure have nothing to do with me, and might be related to my system being a bit screwed.

== Tests ==

This would benefit from unit testing which is currently done in a doctest. Ugh. If I didn't have many other important things on my plate, I'd clean it up already. Please don't shoot me.

 bin/test -vvt distroseriesqueue-translations

= Launchpad lint =

Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.

Linting changed files:
  lib/lp/soyuz/doc/distroseriesqueue-translations.txt
  lib/lp/soyuz/model/queue.py

== Pylint notices ==

lib/lp/soyuz/model/queue.py
    23: [F0401] Unable to import 'storm.locals'
    24: [F0401] Unable to import 'storm.store'
    26: [F0401] Unable to import 'zope.component'
    32: [F0401] Unable to import 'lp.archivepublisher.config'
    33: [F0401] Unable to import 'lp.archivepublisher.customupload'
    34: [F0401] Unable to import 'lp.archivepublisher.utils'
    35: [F0401] Unable to import 'lp.archiveuploader.changesfile'
    36: [F0401] Unable to import 'lp.archiveuploader.tagfiles'
    37: [F0401] Unable to import 'lp.archiveuploader.utils'
    38: [F0401] Unable to import 'canonical.cachedproperty'
    39: [F0401] Unable to import 'canonical.config'
    40: [F0401] Unable to import 'canonical.database.constants'
    41: [F0401] Unable to import 'canonical.database.datetimecol'
    42: [F0401] Unable to import 'canonical.database.enumcol'
    44: [F0401] Unable to import 'canonical.encoding'
    45: [F0401] Unable to import 'canonical.launchpad.helpers'
    46: [F0401] Unable to import 'lp.soyuz.interfaces.archive'
    47: [F0401] Unable to import 'lp.soyuz.interfaces.binarypackagerelease'
    49: [F0401] Unable to import 'canonical.launchpad.interfaces.launchpad'
    50: [F0401] Unable to import 'lp.soyuz.interfaces.queue'
    52: [F0401] Unable to import 'lp.registry.interfaces.person'
    53: [F0401] Unable to import 'lp.registry.interfaces.pocket'
    55: [F0401] Unable to import 'lp.soyuz.interfaces.publishing'
    57: [F0401] Unable to import 'lp.soyuz.interfaces.queue'
    63: [F0401] Unable to import 'lp.soyuz.pas'
    64: [F0401] Unable to import 'canonical.launchpad.mail'
    66: [F0401] Unable to import 'lp.soyuz.scripts.processaccepted'
    68: [F0401] Unable to import 'lp.soyuz.scripts.packagecopier'
    69: [F0401] Unable to import 'canonical.librarian.interfaces'
    70: [F0401] Unable to import 'canonical.librarian.utils'
    71: [F0401] Unable to import 'canonical.launchpad.webapp'
    72: [F0401] Unable to import 'canonical.launchpad.webapp.interfaces'
    73: [F0401] Unable to import 'canonical.launchpad.interfaces.lpstorm'
    1678: [F0401, PackageUploadCustom.publish_DEBIAN_INSTALLER] Unable to import 'lp.archivepublisher.debian_installer'
    1687: [F0401, PackageUploadCustom.publish_DIST_UPGRADER] Unable to import 'lp.archivepublisher.dist_upgrader'
    1696: [F0401, PackageUploadCustom.publish_DDTP_TARBALL] Unable to import 'lp.archivepublisher.ddtp_tarball'
    1779: [F0401, PackageUploadSet.findSourceUpload] Unable to import 'lp.registry.model.distroseries'
    1780: [F0401, PackageUploadSet.findSourceUpload] Unable to import 'lp.registry.model.sourcepackagename'
    1781: [F0401, PackageUploadSet.findSourceUpload] Unable to import 'lp.soyuz.model.sourcepackagerelease'

[Gavin Panella (allenap)]

review: Approve

=== modified file 'lib/lp/soyuz/doc/distroseriesqueue-translations.txt'
--- lib/lp/soyuz/doc/distroseriesqueue-translations.txt	2010-03-12 13:39:33 +0000
+++ lib/lp/soyuz/doc/distroseriesqueue-translations.txt	2010-04-14 11:56:24 +0000
@@ -297,8 +297,35 @@
 
   >>> queue_item.customfiles[0].publish(mock_logger)
   DEBUG: Publishing custom pmount, pmount_0.9.7-2ubuntu2_amd64_translations.tar.gz to ubuntu/dapper
-  DEBUG: Skipping translations since it is a PPA.
-
+  DEBUG: Skipping translations since its purpose is not in
+  MAIN_ARCHIVE_PURPOSES.
+
+  # And this time, we see that there are no entries imported in the queue.
+  >>> translation_import_queue.getAllEntries(target=ubuntu).count()
+  0
+  >>> transaction.abort()
+
+
+== Translations from a rebuild ==
+
+Translations coming from rebuilt packages are also ignored.
+
+  >>> from lp.registry.interfaces.person import IPersonSet
+  >>> from lp.soyuz.interfaces.archive import ArchivePurpose, IArchiveSet
+
+  >>> foobar_archive = getUtility(IArchiveSet).new(
+  ...     purpose=ArchivePurpose.COPY,
+  ...     owner=getUtility(IPersonSet).getByName('name16'),
+  ...     name='rebuilds')
+
+  >>> dapper = getUtility(IDistributionSet)['ubuntu']['dapper']
+  >>> queue_item = dapper.getQueueItems(status=PackageUploadStatus.NEW)[0]
+  >>> queue_item.archive = foobar_archive
+
+  >>> queue_item.customfiles[0].publish(mock_logger)
+  DEBUG: Publishing custom pmount, pmount_0.9.7-2ubuntu2_amd64_translations.tar.gz to ubuntu/dapper
+  DEBUG: Skipping translations since its purpose is not in
+  MAIN_ARCHIVE_PURPOSES.
 
   # And this time, we see that there are no entries imported in the queue.
   >>> translation_import_queue.getAllEntries(target=ubuntu).count()
@@ -314,6 +341,8 @@
   >>> from zope.interface import implements
   >>> from canonical.launchpad.interfaces import ILaunchpadCelebrities
   >>> from lp.soyuz.model.queue import PackageUploadCustom
+  >>> from lp.soyuz.interfaces.archive import (
+  ...     IArchive, ArchivePurpose)
   >>> from lp.soyuz.interfaces.queue import (
   ...     IPackageUpload, IPackageUploadCustom)
   >>> from lp.soyuz.interfaces.queue import PackageUploadCustomFormat
@@ -323,6 +352,11 @@
   ...     ISourcePackageRelease)
   >>> from lp.registry.interfaces.pocket import PackagePublishingPocket
 
+  >>> class MockArchive:
+  ...       implements(IArchive)
+  ...       def __init__(self, purpose):
+  ...           self.purpose = purpose
+
   >>> class MockSourcePackageRelease:
   ...       implements(ISourcePackageRelease)
   ...       def __init__(self, component, creator):
@@ -338,14 +372,13 @@
 
   >>> class MockPackageUpload:
   ...     implements(IPackageUpload)
-  ...     def __init__(self, pocket, auto_sync, sourcepackagerelease):
+  ...     def __init__(self, pocket, auto_sync, sourcepackagerelease,
+  ...                  archive):
   ...         self.id = 1
   ...         self.pocket = pocket
   ...         self.auto_sync = auto_sync
   ...         self.sourcepackagerelease = sourcepackagerelease
-  ...
-  ...     def isPPA(self):
-  ...         return False
+  ...         self.archive = archive
   ...
   ...     def isAutoSyncUpload(self, changed_by_email=None):
   ...         return self.auto_sync
@@ -363,10 +396,11 @@
 
   >>> katie = getUtility(ILaunchpadCelebrities).katie
   >>> release_pocket = PackagePublishingPocket.RELEASE
+  >>> archive = MockArchive(ArchivePurpose.PRIMARY)
 
   >>> katie_sourcepackagerelease = MockSourcePackageRelease('main', katie)
   >>> sync_package_upload = MockPackageUpload(
-  ...     release_pocket, True, katie_sourcepackagerelease)
+  ...     release_pocket, True, katie_sourcepackagerelease, archive)
   >>> sync_package_upload.isAutoSyncUpload()
   True
   >>> translations_upload = MockPackageUploadCustom()
@@ -377,7 +411,7 @@
 Non-auto-sync uploads by 'katie' still indicate 'katie' as the uploader.
 
   >>> non_sync_package_upload = MockPackageUpload(
-  ...     release_pocket, False, katie_sourcepackagerelease)
+  ...     release_pocket, False, katie_sourcepackagerelease, archive)
   >>> non_sync_package_upload.isAutoSyncUpload()
   False
   >>> translations_upload.packageupload = non_sync_package_upload
@@ -390,7 +424,7 @@
   >>> carlos = person_set.getByName('carlos')
   >>> carlos_sourcepackagerelease = MockSourcePackageRelease('main', carlos)
   >>> carlos_package_upload = MockPackageUpload(
-  ...     release_pocket, False, carlos_sourcepackagerelease)
+  ...     release_pocket, False, carlos_sourcepackagerelease, archive)
   >>> carlos_package_upload.isAutoSyncUpload()
   False
   >>> translations_upload.packageupload = carlos_package_upload

=== modified file 'lib/lp/soyuz/model/queue.py'
--- lib/lp/soyuz/model/queue.py	2010-04-12 11:37:48 +0000
+++ lib/lp/soyuz/model/queue.py	2010-04-14 11:56:24 +0000
@@ -43,6 +43,7 @@
 from canonical.database.sqlbase import SQLBase, sqlvalues
 from canonical.encoding import guess as guess_encoding, ascii_smash
 from canonical.launchpad.helpers import get_email_template
+from lp.soyuz.interfaces.archive import MAIN_ARCHIVE_PURPOSES
 from lp.soyuz.interfaces.binarypackagerelease import (
     BinaryPackageFormat)
 from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
@@ -1701,9 +1702,11 @@
         """See `IPackageUploadCustom`."""
         sourcepackagerelease = self.packageupload.sourcepackagerelease
 
-        # Ignore translation coming from PPA.
-        if self.packageupload.isPPA():
-            debug(logger, "Skipping translations since it is a PPA.")
+        # Ignore translations not with main distribution purposes.
+        if self.packageupload.archive.purpose not in MAIN_ARCHIVE_PURPOSES:
+            debug(logger,
+                  "Skipping translations since its purpose is not "
+                  "in MAIN_ARCHIVE_PURPOSES.")
             return
 
         valid_pockets = (