Issue 7238 - Fix multi-locale builds

abb-build/build.py

 #!/usr/bin/env python
 # This file is part of Adblock Plus <https://adblockplus.org/>,
 # Copyright (C) 2006-present 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
@@ skipping 80 matching lines @@
         changesets = json.load(fd)
 
     if not os.path.exists(_L10N_BASE_PATH):
         os.makedirs(_L10N_BASE_PATH)
 
     l10n_base_repo = "https://hg.mozilla.org/l10n-central/%s/"
     for locale in changesets.keys():
             revision = changesets[locale]["revision"]
             repo_path = os.path.join(_L10N_BASE_PATH, locale)
             if os.path.exists(repo_path):
-                subprocess.check_call(["hg", "up", "-r", revision],
-                                      cwd=repo_path)
+                update_cmd = ["hg", "up", "-r", revision]
+                if subprocess.call(update_cmd, cwd=repo_path):
+                    subprocess.check_call(["hg", "pull"], cwd=repo_path)
+                    subprocess.check_call(update_cmd, cwd=repo_path)
+
             else:
                 repo = l10n_base_repo % locale
                 subprocess.check_call(["hg", "clone", repo, "-r", revision],
                                       cwd=_L10N_BASE_PATH)
 
 
 def _read_locales():
     with open(_MAEMO_LOCALES_PATH, "r") as fd:
         lines = fd.readlines()
 
@@ skipping 132 matching lines @@
         sys.exit(6)
 
     if do_build:
         apk_path = _build(architecture, distribution_mode, build_mode,
                           config.ANDROID_SDK_PATH, config.ANDROID_NDK_PATH)
     if do_sign:
         _sign(apk_path, config.ANDROID_KEYSTORE_PATH, config.ANDROID_KEY_NAME,
               config.ANDROID_SDK_PATH)
     else:
         print(apk_path)