Issue 1363 - Make sure source code archives created by release automation consider the new dependen…

releaseAutomation.py

 # coding: 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/.
 
 import os, re, codecs, subprocess, tarfile, json
 
 def get_dependencies(prefix, repos):
   from ensure_dependencies import read_deps, safe_join
   repo = repos[prefix]
   deps = read_deps(repo)
   if deps:
     for subpath in deps:
       if subpath.startswith('_'):
         continue
       depprefix = prefix + subpath + '/'
       deppath = safe_join(repo, subpath)
       repos[depprefix] = deppath
       get_dependencies(depprefix, repos)
 
 def create_sourcearchive(repo, output):
   with tarfile.open(output, mode='w:gz') as archive:
     repos = {'': repo}
     get_dependencies('', repos)
     for prefix, path in repos.iteritems():
       process = subprocess.Popen(['hg', 'archive', '-R', path, '-t', 'tar', '-S', '-'], stdout=subprocess.PIPE)
-      with tarfile.open(fileobj=process.stdout, mode='r|') as repoarchive:
-        for fileinfo in repoarchive:
-          if os.path.basename(fileinfo.name) in ('.hgtags', '.hgignore'):
-            continue
-          filedata = repoarchive.extractfile(fileinfo)
-          fileinfo.name = re.sub(r'^[^/]+/', prefix, fileinfo.name)
-          archive.addfile(fileinfo, filedata)
+      try:
+        with tarfile.open(fileobj=process.stdout, mode='r|') as repoarchive:
+          for fileinfo in repoarchive:
+            if os.path.basename(fileinfo.name) in ('.hgtags', '.hgignore'):
+              continue
+            filedata = repoarchive.extractfile(fileinfo)
+            fileinfo.name = re.sub(r'^[^/]+/', prefix, fileinfo.name)
+            archive.addfile(fileinfo, filedata)
+      finally:
+        process.stdout.close()
+        process.wait()
 
 def run(baseDir, type, version, keyFiles, downloadsRepo):
   if type == "gecko":
     import buildtools.packagerGecko as packager
   elif type == "chrome":
     import buildtools.packagerChrome as packager
 
   # Replace version number in metadata file "manually", ConfigParser will mess
   # up the order of lines.
   metadata = packager.readMetadata(baseDir, type)
@@ skipping 58 matching lines @@
   create_sourcearchive(baseDir, archivePath)
   downloads.append(archivePath)
 
   # Now add the downloads and commit
   subprocess.check_call(['hg', 'add', '-R', downloadsRepo] + downloads)
   subprocess.check_call(['hg', 'commit', '-R', downloadsRepo, '-m', 'Releasing %s %s' % (extensionName, version)])
 
   # Push all changes
   subprocess.check_call(['hg', 'push', '-R', baseDir])
   subprocess.check_call(['hg', 'push', '-R', downloadsRepo])