1317313 - Android Aurora Nightly's broken after merge day

Status: RESOLVED FIXED

(Release Engineering :: General, defect)

Description

[Carsten Book [:Tomcat]]

https://treeherder.mozilla.org/logviewer.html#?job_id=4168768&repo=mozilla-aurora#L65102

 06:06:03     INFO -  09:06:03    ERROR -  make[3]: *** [stage-package] Error 1
 06:06:03     INFO -  09:06:03     INFO -  make[3]: Leaving directory `/builds/slave/m-aurora-and-api-15-ntly-00000/build/src/obj-firefox/mobile/android/installer'
 06:06:03     INFO -  09:06:03    ERROR -  make[2]: *** [make-package] Error 2
 06:06:03     INFO -  09:06:03     INFO -  make[2]: Leaving directory `/builds/slave/m-aurora-and-api-15-ntly-00000/build/src/obj-firefox/mobile/android/installer'
 06:06:03     INFO -  09:06:03    ERROR -  make[1]: *** [default] Error 2
 06:06:03     INFO -  09:06:03     INFO -  make[1]: Leaving directory `/builds/slave/m-aurora-and-api-15-ntly-00000/build/src/obj-firefox/mobile/android/installer'
06:06:03

Comment 1

[Justin Wood (:Callek)]

Attachment: Bug 1317313 - Unbust todays Android Aurora Nightly (post merge-day) by adding more to whitelist, and fixing regex.

Review commit: https://reviewboard.mozilla.org/r/92746/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/92746/

Comment 2

[Carsten Book [:Tomcat]]

Comment on attachment 8810422 [details]
Bug 1317313 - Unbust todays Android Aurora Nightly (post merge-day) by adding more to whitelist, and fixing regex.

https://reviewboard.mozilla.org/r/92746/#review92716

Comment 3

[Carsten Book [:Tomcat]]

looks ok to me

Comment 4

[Michael Shal [:mshal]]

Comment on attachment 8810422 [details]
Bug 1317313 - Unbust todays Android Aurora Nightly (post merge-day) by adding more to whitelist, and fixing regex.

https://reviewboard.mozilla.org/r/92746/#review92714

::: toolkit/mozapps/installer/find-dupes.py:42
(Diff revision 1)
>      'chrome/en-US/locale/branding/brand.properties'
>      >>> normalize_l10n_path('chrome/fr/locale/fr/browser/aboutHome.dtd')
>      'chrome/en-US/locale/en-US/browser/aboutHome.dtd'
>      '''
> -    p = re.sub(r'chrome/(\S+)/locale/\1',
> -               'chrome/en-US/locale/en-US',
> +    # Keep a trailing slash here! e.g. locales like 'br' can transform
> +    # 'chrome/br/lcoale/branding/' into 'chrome/en-US/locale/en-USanding/'

nit: "lcoale" -> "locale"

Comment 5

[Justin Wood (:Callek)]

Comment on attachment 8810422 [details]
Bug 1317313 - Unbust todays Android Aurora Nightly (post merge-day) by adding more to whitelist, and fixing regex.

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/92746/diff/1-2/

Comment 6

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/c765cdbfce28
Unbust todays Android Aurora Nightly (post merge-day) by adding more to whitelist, and fixing regex. r=mshal,Tomcat

Comment 7

[Justin Wood (:Callek)]

https://hg.mozilla.org/releases/mozilla-aurora/rev/f11ca24b2382ed6c8c7970a82fff53f7f3e0aa6d

Comment 8

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/c765cdbfce28