792572 - Several Search engines disappears after update Aurora17.0a2 2012-09-16 from 2012-09-15 / (update 16Beta4 from 16Beta3) in ja localized version

Status: VERIFIED FIXED

(Mozilla Localizations :: ja / Japanese, defect)

Description

[Alice0775 White]

Build Identifier:
http://hg.mozilla.org/releases/mozilla-aurora/rev/006174be2306
Mozilla/5.0 (Windows NT 6.1; WOW64; rv:17.0) Gecko/17.0 Firefox/17.0 ID:20120919042010

Several Search engines disappears after update Aurora17.0a2 2012-09-16 from 2012-09-15.
And also several Search engines disappears after update 16Beta4 from 16Beta3.

Steps to reproduce:
1. Install Aurora17.0a2 2012-09-15 ja localized version.
   http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/2012-09-15-04-20-08-mozilla-aurora-l10n/firefox-17.0a2.ja.win32.zip

2. Start Aurora with newly created profile
3. Observe installed Search Engines from SearchBar dropdown
    Google
    Yahoo! JAPAN
    Amazon.co.jp
    楽天市場
    Yahoo!オークション
    教えて!goo
    Twitter
    Wikipedia(ja)
4. Update from About Aurora and restart

6. Observe installed Search Engines again, 
   You can see only two engines.
    Twitter
    Wikipedia(ja)

Actual results:
  Several Search engines disappears.

Expected results:
  Not disappear

Comment 1

[Alice0775 White]

I found a format error of  *.xml in searchplugins folder.
<?xml version="1.0" encoding="UTF-8"?> is missing at top of the file.

And several error message show in Error console
時刻: 2012/09/20 6:15:32
エラー: 実体の初めに XML またはテキスト宣言がありません。
ソースファイル: moz-nullprincipal:{2ccf0aa9-0b85-4272-9448-549a0bd509a3}
行: 5, 列: 1
ソースコード:
<?xml version="1.0" encoding="UTF-8"?>

Comment 2

[Alice0775 White]

Maybe regressed by 4575dc7ad6f9	Masahiko Imanaka — upgrade license to MPL2

Comment 3

[Alice0775 White]

http://hg.mozilla.org/releases/l10n/mozilla-aurora/ja/pushloghtml?changeset=4575dc7ad6f9

Comment 4

[Alice0775 White]

Comment should not place before XML Declaration.

EX.searchplugins/google-jp.xml

<!-- This Source Code Form is subject to the terms of the Mozilla Public
   - 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/. -->

<?xml version="1.0" encoding="UTF-8"?>
<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
<ShortName>Google</ShortName>
...

Comment 5

[Axel Hecht [:Pike]]

note, the en-US ones don't have  

<?xml version="1.0" encoding="UTF-8"?>

at all.

Moving over to Japanese.

Milos, can you cross check if we have similar problems in other locales? LSV should help there, I guess.

Comment 6

[Alex Keybl [:akeybl]]

Another good reason for why we freeze l10n at beta 4 :)

Axel - can we back out the offending change today rather than waiting for further testing?

Comment 7

[Masahiko Imanaka [:marsf]]

The MPL2 patch is came from Bug 782178. They have affected to following files:

/browser/searchplugins/*.xml
/mail/searchplugins/*.xml
/suite/searchplugins/*.xml

Anyway, we must recover them by removing license lines from xml files. Or, moving them under the "<?xml ... ?>" line. Which is the best way?


(removing?)
<?xml version="1.0" encoding="UTF-8"?>
(move to here?)

Comment 8

[Masahiko Imanaka [:marsf]]

And, for mobile. It's critical X-(

/mobile/searchplugins/*.xml

Comment 9

[Axel Hecht [:Pike]]

The safest fix is to do what en-US does, which is not having the <?xml?> prefix altogether.

Comment 10

[Masahiko Imanaka [:marsf]]

Attachment: remove <?xml?> line from all search plugins

This will be the safest fix.

Comment 11

[Axel Hecht [:Pike]]

Comment on attachment 662853 [details] [diff] [review]
remove <?xml?> line from all search plugins

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

Thanks, this looks good to me.

Can you land this first on central or aurora and test the depend builds that get kicked off on those branches?

Comment 12

[Gervase Markham [:gerv]]

The patch in bug 782178 places the XML comment _after_ the XML prolog. The script takes great care to do this, for obvious reasons! Example quotation from the original patch:

diff --git a/ja/browser/searchplugins/amazon-jp.xml b/ja/browser/searchplugins/amazon-jp.xml
--- a/ja/browser/searchplugins/amazon-jp.xml
+++ b/ja/browser/searchplugins/amazon-jp.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - 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/. -->
+
 <SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/">
 <ShortName>Amazon.co.jp</ShortName>


Did some other tool swap them round, perhaps before checkin?

Gerv

Comment 13

[Masahiko Imanaka [:marsf]]

Landed on aurora (ja/ja-JP-mac):
http://hg.mozilla.org/releases/l10n/mozilla-aurora/ja/rev/1e62dae14d83
http://hg.mozilla.org/releases/l10n/mozilla-aurora/ja-JP-mac/rev/673d5ace7844

Totally, This is our mistake (affects ja locales only).

Comment 14

[Axel Hecht [:Pike]]

Can you test the depend builds on ftp://ftp.mozilla.org/pub/mozilla.org/firefox/tinderbox-builds/mozilla-aurora-l10n/? Thanks.

Comment 15

[Masahiko Imanaka [:marsf]]

I've confirmed the fix on tinderbox build.

Comment 16

[Masahiko Imanaka [:marsf]]

Same patch applied to beta:
http://hg.mozilla.org/releases/l10n/mozilla-beta/ja/rev/d360cdf26d8e
http://hg.mozilla.org/releases/l10n/mozilla-beta/ja-JP-mac/rev/e53000e3563f

Comment 17

[Axel Hecht [:Pike]]

Hi marsf, thanks for the quick fix. Make sure you sign-off on both beta and aurora, too? Thanks.

Comment 18

[Axel Hecht [:Pike]]

AFAICT, we're good to close this bug, too.

Comment 19

[Ioana (away)]

Verified this issue by updating to Firefox 16 beta 5 from Fx 15b6, Fx 16b3, Fx 16b4. Custom engines are all kept through the updates. Default engines are removed (as specified in comment 0) when updating to Fx 16b4, but they are restored when updating to Fx 16b5. Everything works fine when updating directly to Fx 16b5.

Comment 20

[Ioana (away)]

09/26 Aurora
09/27 Nightly

Also verified that when updating Firefox 17.0 Aurora and Firefox 18.0 Nightly, all the search engines are preserved.


I would like to try updating Aurora from the 09/16 build to a build with the fix, but I couldn't find the 09/16 ja build anywhere on ftp.mozilla.org/pub/mozilla.org/firefox/nightly/. If anyone can point me to where I can find it, please do so here.