Merge lp://staging/~henninge/launchpad/devel-741571-filter-templates-in-upload into lp://staging/launchpad

Proposed by Henning Eggers
Status: Merged
Approved by: Henning Eggers
Approved revision: no longer in the source branch.
Merged at revision: 12659
Proposed branch: lp://staging/~henninge/launchpad/devel-741571-filter-templates-in-upload
Merge into: lp://staging/launchpad
Prerequisite: lp://staging/~henninge/launchpad/devel-605924-hastranslationtemplates
Diff against target: 620 lines (+173/-76)
16 files modified
lib/lp/registry/model/distribution.py (+2/-5)
lib/lp/registry/model/distroseries.py (+14/-8)
lib/lp/registry/model/product.py (+2/-1)
lib/lp/registry/model/productseries.py (+4/-0)
lib/lp/registry/model/sourcepackage.py (+4/-0)
lib/lp/soyuz/model/sourcepackagerelease.py (+7/-14)
lib/lp/soyuz/tests/test_sourcepackagerelease.py (+10/-14)
lib/lp/translations/browser/productseries.py (+1/-4)
lib/lp/translations/browser/sourcepackage.py (+2/-8)
lib/lp/translations/doc/translationimportqueue.txt (+28/-3)
lib/lp/translations/interfaces/hastranslationtemplates.py (+11/-4)
lib/lp/translations/interfaces/translationimportqueue.py (+4/-1)
lib/lp/translations/model/hastranslationtemplates.py (+16/-0)
lib/lp/translations/model/translationimportqueue.py (+7/-3)
lib/lp/translations/tests/test_hastranslationtemplates.py (+60/-7)
lib/lp/translations/utilities/translation_import.py (+1/-4)
To merge this branch: bzr merge lp://staging/~henninge/launchpad/devel-741571-filter-templates-in-upload
Reviewer Review Type Date Requested Status
Abel Deuring (community) code Approve
Review via email: mp+54688@code.staging.launchpad.net

Commit message

[r=adeuring][bug=732612,741571] Always upload translation templates from soyuz builds.

Description of the change

= Summary =

Apart from fixing bug 741571 as described in the bug, this branch also
addresses a left-over issue from the previous branch. It implements
has_sharing_translation_templates which encapsualates a pattern that
appeared in many places. This makes the code shorter and much better to
read.

I also removed some lint that was already there.

== Implementation details ==

I find this a very straight forward branch and enjoyed coding it. I
hope you can follow along just as easily.

== Tests ==

Lot of stuff has been touched so I'd advise a full test run.

== Demo and Q/A ==

I am not sure how to QA soyuz stuff but you should see only templates
appear in the import queue of a sourcepackage that has upstream
templates.

= Launchpad lint =

Checking for conflicts and issues in changed files.

Linting changed files:
  lib/lp/translations/tests/test_potemplate.py
  lib/lp/registry/tests/test_productseries.py
  lib/lp/translations/templates/distroseries-translations.pt
  lib/lp/translations/tests/test_hastranslationtemplates.py
  lib/lp/translations/interfaces/potemplate.py
  lib/lp/registry/model/productseries.py
  lib/lp/translations/model/translationimportqueue.py
  lib/lp/soyuz/tests/test_sourcepackagerelease.py
  lib/lp/translations/browser/pofile.py
  lib/lp/translations/model/pofile.py
  lib/lp/soyuz/model/sourcepackagerelease.py
  lib/lp/translations/templates/productseries-translations.pt
  lib/lp/translations/doc/translationimportqueue.txt
  lib/lp/registry/interfaces/productseries.py
  lib/lp/registry/model/sourcepackage.py
  lib/lp/translations/browser/productseries.py
  lib/lp/registry/model/product.py
  lib/lp/translations/model/hastranslationtemplates.py
  lib/lp/registry/model/distroseries.py
  lib/lp/translations/utilities/translation_import.py
  lib/lp/translations/interfaces/hastranslationtemplates.py
  lib/lp/translations/model/potemplate.py
  lib/lp/registry/model/distribution.py
  lib/lp/translations/browser/sourcepackage.py
  lib/lp/translations/browser/potemplate.py
  lib/lp/translations/tests/test_translationtemplatescollection.py
  lib/lp/translations/interfaces/translationimportqueue.py
  lib/lp/translations/doc/distroseries-language.txt

./lib/lp/translations/browser/pofile.py
     788: E301 expected 1 blank line, found 2
     904: E301 expected 1 blank line, found 2
./lib/lp/soyuz/model/sourcepackagerelease.py
     201: redefinition of function 'copyright' from line 192
./lib/lp/registry/model/distroseries.py
     392: E301 expected 1 blank line, found 2

To post a comment you must log in.
Revision history for this message
Abel Deuring (adeuring) wrote :

thanks for this fast buf fix!

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.