Issue 3128 - The default search engine is removed if it was one of those removed by issue 3047 (moz…

mozharness/abb/transform_locales.py

 # This file is part of Adblock Plus
 # Copyright (C) 2006-2015 Eyeo GmbH
 #
 # Adblock Plus is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
 # published by the Free Software Foundation.
 #
 # Adblock Plus is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ skipping 118 matching lines @@
     with open(region_file_path, "r") as fd:
         for line in fd:
             line = line.rstrip("\r\n")
             if not _SEARCH_PROPS_RE.match(line.strip()):
                 props.append(line)
 
     # Append default search engine name
     props.append("browser.search.defaultenginename=%s" % engine_order[0])
 
     # Append search engine order
-    for i in range(0, min(3, len(engine_order))):
+    for i in range(0, min(5, len(engine_order))):
         props.append("browser.search.order.%d=%s" % (i + 1, engine_order[i]))
 
+    # We're skipping this step, though I want to have that line included here,

[Felix Dahlke, 2015/10/12 11:20:18]

Why keep the line? We can retrieve it from hg log :)

It looks like we won't have to change search engines anymore, just their
order...

[René Jeschke, 2015/10/12 12:59:59]

Done.

+    # so I only commented out writing back of list.txt.
+    # See https://issues.adblockplus.org/ticket/3128
     # Write back list.txt
-    _write_lines(list_file_path, engine_ids)
+    # _write_lines(list_file_path, engine_ids)
 
     # Write back region.properties
     _write_lines(region_file_path, props)
 
 
 class MinimalLogger:
     def info(self, s):
         print "INFO: %s" % s
 
     def error(self, s):
@@ skipping 17 matching lines @@
 
     logger.info("Found %d locales" % len(locales))
 
     for locale in locales:
         locale_path = os.path.join(chrome_path, locale, "locale", locale)
         if os.path.exists(locale_path):
             _transform_locale(locale, locale_path, logger)
         else:
             logger.error("Missing 'locale' folder for '%s'" % locale)