moz-grab-langpacks: create temporary directories with tempfile.mkdtemp()

1 files changed, 9 insertions, 3 deletions

diff --git a/scripts/moz-grab-langpacks b/scripts/moz-grab-langpacks
index f275b29..e8bcfca 100755
--- a/scripts/moz-grab-langpacks
+++ b/scripts/moz-grab-langpacks
@@ -18,6 +18,7 @@ import subprocess
 import glob
 import shutil
 import datetime
+import tempfile
 from xml.parsers import expat
 
 def parse_cmdline():
@@ -86,7 +87,7 @@ class LangpackXPIParser:
 		self._haveXMLDeclaration = False
 
 	def _extract_langpack(self):
-		self._tmpdir = "tmp-%s" % self._xpi
+		self._tmpdir = tempfile.mkdtemp()
 		unzipcmd = ['unzip', '-qq', '-d', self._tmpdir, self._xpi]
 		subprocess.call(unzipcmd)
 
@@ -115,6 +116,9 @@ class LangpackXPIParser:
 
 def create_langpack_tarball(app, version, url, use_xz=True):
 	cwd = os.getcwd()
+	tempdir = tempfile.mkdtemp()
+	os.chdir(tempdir)
+
 	langpackdir="%s-langpacks" % app
 	os.mkdir(langpackdir)
 	os.chdir(langpackdir)
@@ -150,7 +154,7 @@ def create_langpack_tarball(app, version, url, use_xz=True):
 
 	# Tar them up
 	print 'Creating tarball...'
-	os.chdir(cwd)
+	os.chdir(tempdir)
 
 	if use_xz:
 		suffix = 'xz'
@@ -163,9 +167,11 @@ def create_langpack_tarball(app, version, url, use_xz=True):
 	tarballname = '%s-langpacks-%s-%s.tar.%s' % (app, version, now, suffix)
 	tarcmd = ['tar', tarflags, tarballname, langpackdir ]
 	subprocess.call(tarcmd)
+	shutil.move(tarballname, cwd)
 
 	print "Created %s" % tarballname
-	shutil.rmtree(langpackdir)
+	os.chdir(cwd)
+	shutil.rmtree(tempdir)
 
 if __name__ == '__main__':
 	args = parse_cmdline()