Back out 633092dc002e790c8869e93bb6819d6edd5958c6 for failing Thunderbird 45.x builds. a=wsmwk
authorPhilipp Kewisch <mozilla@kewis.ch>
Thu, 22 Dec 2016 20:52:10 +0100
changeset 7217 a30e18094041f4267e70eff3711f202515d41216
parent 7214 7a930dbb818c4d2eb1c8560bef04a43bdb5b5594
child 7218 f72ba96916998da7d8679c9ab42a47c65ce40115
push id5379
push usermozilla@kewis.ch
push dateThu, 22 Dec 2016 19:52:27 +0000
reviewerswsmwk
Back out 633092dc002e790c8869e93bb6819d6edd5958c6 for failing Thunderbird 45.x builds. a=wsmwk
lib/python/build/l10n.py
scripts/l10n/create-release-repacks.py
--- a/lib/python/build/l10n.py
+++ b/lib/python/build/l10n.py
@@ -229,17 +229,17 @@ def repackLocale(locale, l10nRepoDir, l1
     # Some versions of make that we use (at least pymake) imply --print-directory
     # We need to turn it off to avoid getting extra output that mess up our
     # parsing of the checksum file path.
     curdir = os.getcwd()
     try:
         os.chdir(localeSrcDir)
         relative_checksums = get_output(make +
                                         ["--no-print-directory", "echo-variable-CHECKSUM_FILE", "AB_CD=%s" % locale],
-                                        env=env).strip("\"'\n\r")
+                                        env=env, cwd=localeSrcDir).strip("\"'\n\r")
         return path.normpath(path.join(localeSrcDir, relative_checksums))
     finally:
         os.chdir(curdir)
 
 
 def getLocalesForChunk(possibleLocales, chunks, thisChunk):
     if 'en-US' in possibleLocales:
         possibleLocales.remove('en-US')
--- a/scripts/l10n/create-release-repacks.py
+++ b/scripts/l10n/create-release-repacks.py
@@ -52,17 +52,17 @@ def createRepacks(sourceRepo, revision, 
     log.info('Got buildid: %s' % buildid)
     sourceRepoName = path.split(sourceRepo)[-1]
     absObjdir = path.abspath(path.join(sourceRepoName, objdir))
     localeSrcDir = path.join(absObjdir, appName, "locales")
     # Even on Windows we need to use "/" as a separator for this because
     # compare-locales doesn"t work any other way
     l10nIni = "/".join([sourceRepoName, appName, "locales", "l10n.ini"])
     env = {
-        "MOZ_OBJDIR": absObjdir,
+        "MOZ_OBJDIR": objdir,
         "MOZ_MAKE_COMPLETE_MAR": "1",
         "DOWNLOAD_HOST": ftpServer,
         "UPLOAD_HOST": stageServer,
         "UPLOAD_USER": stageUsername,
         "UPLOAD_SSH_KEY": stageSshKey,
         "UPLOAD_TO_TEMP": "1",
         "MOZ_PKG_PRETTYNAMES": "1",
         "MOZILLA_REV": os.getenv('MOZILLA_REV', ''),