757643 - package-name.txt messed up (probably due to licensing boilerplate change)

Status: RESOLVED FIXED

(Firefox for Android Graveyard :: General, defect)

Description

[William Lachance (:wlach)]

Before today's nightly, package-name.txt inside the Android apk looked like this:

org.mozilla.fennec

Now it looks like:

 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/. #
     
org.mozilla.fennec 

This screws up code which tries to programatically get the package name from the apk, like Eideticker (https://wiki.mozilla.org/Project_Eideticker). This change was almost certainly unintentional -- is there anything we can do to get the old behaviour back? :)

Comment 1

[William Lachance (:wlach)]

Attachment: Quick patch to remove accidentally-added licensing boilerplate

Trivial patch

Comment 2

[Mark Finkle (:mfinkle) (use needinfo?)]

Comment on attachment 626222 [details] [diff] [review]
Quick patch to remove accidentally-added licensing boilerplate

Looks good to me. This file is designed to be read via a script, so the license is complicating things.

Comment 3

[William Lachance (:wlach)]

Risk of this is fairly minimal, but may as well do a try run overnight...

Comment 4

[Gervase Markham [:gerv]]

Hmm. I thought we didn't add boilerplate to .txt files. Sorry about that. Feel free to revert the change.

Gerv

Comment 5

[William Lachance (:wlach)]

Try run looks good: https://tbpl.mozilla.org/?tree=Try&rev=d2a83a5870f9

Comment 6

[William Lachance (:wlach)]

Pushed: https://hg.mozilla.org/integration/mozilla-inbound/rev/095af70a538b

Comment 7

[Ed Morley [:emorley]]

https://hg.mozilla.org/mozilla-central/rev/095af70a538b

Comment 8

[William Lachance (:wlach)]

Unfortunately this patch did not properly fix the issue. A "#filter substition" token is needed at the top for this to work correctly. Boo on me for not testing whether my patch actually fixed the problem.

Comment 9

[William Lachance (:wlach)]

Attachment: Updated patch to properly fix fennec package name issue

Hey Mark,

Sorry about this, but I need to reopen this bug and ask for another review. My previous patch did not properly fix the issue -- in retrospect I should have (1) done a straightforward revert and (2) actually tested to make sure that my patch had the desired effect. I thought this was so simple as to not require that (but somehow still did a try run anyway). Anyway, live and (re)learn, here's an updated patch. A speedy review would be helpful for Eideticker.

Comment 10

[William Lachance (:wlach)]

Inbound: https://hg.mozilla.org/integration/mozilla-inbound/rev/5545fc494089

Comment 11

[Ed Morley [:emorley]]

https://hg.mozilla.org/mozilla-central/rev/5545fc494089