1415432 - .ftl files repackaged multiple times

Status: RESOLVED FIXED

(Core :: Internationalization, enhancement)

Description

[Zibi Braniecki [:zbraniecki][:gandalf]]

The code we landed in bug 1413985 is executed on windows it gets repackaged twice.

I tried to look into why and couldn't make much sense out of it - I suspect it's something between repackage and repackage-installer.

But I also noticed that all the code in l10n.py is testing `contains` before adding to formatter.
Adding the test makes it work well.

Comment 1

[Zibi Braniecki [:zbraniecki][:gandalf]]

Attachment: patch

This fixes the build.

Comment 2

[Mike Hommey [:glandium]]

Comment on attachment 8926255 [details] [diff] [review]
patch

Review of attachment 8926255 [details] [diff] [review]:
-----------------------------------------------------------------

Theoretically, I think all the contains should go away, but the current repack jobs kind of suck, so short of fixing them, I guess this is fine.

Comment 3

[Zibi Braniecki [:zbraniecki][:gandalf]]

Yeah, it would be good not to have this, but I'd prefer not to attempt to debug the whole repack makefile system now :)

Comment 4

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/mozilla-inbound/rev/969c788d78b3
ftl files repackaged multiple times. r=glandium

Comment 5

[Zibi Braniecki [:zbraniecki][:gandalf]]

This has been merged to m-c. https://hg.mozilla.org/mozilla-central/rev/969c788d78b3

Comment 6

[Sebastian Hengst [:aryx] (needinfo me if it's about an intermittent or backout)]

https://hg.mozilla.org/mozilla-central/rev/969c788d78b3