launchpad-reviewers team mailing list archive

["Jeroen T. Vermeulen" <jtv@xxxxxxxxxxxxx>]

Jeroen T. Vermeulen has proposed merging lp:~jtv/launchpad/bug-631259 into lp:launchpad/devel.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers): code


= Bug 631259 =

Release-critical.

The work on bug 597539 finally removes our dependency on TranslationMessage.pofile, and stops initializing that field.  But until rollout, the production code still relies on it while edge merrily produces records that have it nulled!

This fix simply restores the original initializer.  (A diff against devel from 2010-09-03 shows my comment as the only difference in the file).  I'll prepare a separate branch that removes it again after rollout.


Jeroen
-- 
https://code.launchpad.net/~jtv/launchpad/bug-631259/+merge/34651
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~jtv/launchpad/bug-631259 into lp:launchpad/devel.

=== modified file 'lib/lp/translations/model/potmsgset.py'
--- lib/lp/translations/model/potmsgset.py	2010-09-03 14:53:09 +0000
+++ lib/lp/translations/model/potmsgset.py	2010-09-06 03:48:45 +0000
@@ -843,9 +843,11 @@
                         imported_message.is_current = False
                 return None
             else:
+                # The pofile=pofile is only needed until 10.09 rollout.
                 matching_message = TranslationMessage(
                     potmsgset=self,
                     potemplate=pofile.potemplate,
+                    pofile=pofile,
                     language=pofile.language,
                     origin=origin,
                     submitter=submitter,