Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

merge default -> production

--HG--
branch : production
  • Loading branch information...
commit 0b0ac275b116742a20be46e2f1395f32a7d1378f 2 parents ba8ebe4 + 1054740
@escapewindow escapewindow authored
Showing with 2 additions and 2 deletions.
  1. +2 −2 scripts/b2g_build.py
View
4 scripts/b2g_build.py
@@ -506,7 +506,7 @@ def _generate_git_locale_manifest(self, locale, url, git_repo,
l10n_git_sha = self.query_translated_revision(url, 'l10n', revision)
return ' <project name="%s" path="%s" remote="mozillaorg" revision="%s"/>' % (git_repo.replace(git_base_url, ''), local_path, l10n_git_sha)
- def _generate_locale_manifest(self, git_base_url="https://git.mozilla.org/"):
+ def _generate_locale_manifest(self, git_base_url="https://git.mozilla.org/release/"):
""" Add the locales to the source manifest.
"""
manifest_config = self.config.get('manifest', {})
@@ -599,7 +599,7 @@ def update_source_manifest(self):
# Write the gaia commit information to 'gaia_commit_override.txt'
gaia_override = os.path.join(dirs['abs_work_dir'], 'gaia', 'gaia_commit_override.txt')
self.write_to_file(gaia_override, "%s\n%s\n" % (gaia_git, gaia_time))
- new_sources.extend(self._generate_locale_manifest())
+ new_sources.extend(self._generate_locale_manifest(git_base_url=git_base_url))
self.write_to_file(sourcesfile, "\n".join(new_sources), verbose=False)
self.run_command(["diff", "-u", sourcesfile_orig, sourcesfile], success_codes=[1])
Please sign in to comment.
Something went wrong with that request. Please try again.