From 8b3024080bacd79ab022efc9a2b8f8a1d0ea3728 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Fri, 11 Jan 2008 10:36:25 +0000 Subject: Use tempfile.mkdtemp() rather than hardcoded tmpdir httpinstance.py currently uses a hardcoded /tmp/ipa temporary directory. Make it use tempfile.mkdtemp() instead. Signed-off-by: Mark McLoughlin --- ipa-server/ipaserver/httpinstance.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'ipa-server') diff --git a/ipa-server/ipaserver/httpinstance.py b/ipa-server/ipaserver/httpinstance.py index 4f8946b45..beca3e83a 100644 --- a/ipa-server/ipaserver/httpinstance.py +++ b/ipa-server/ipaserver/httpinstance.py @@ -131,15 +131,10 @@ class HTTPInstance(service.Service): shutil.copy(ds_ca.cacert_fname, "/usr/share/ipa/html/ca.crt") os.chmod("/usr/share/ipa/html/ca.crt", 0444) - try: - shutil.rmtree("/tmp/ipa") - except: - pass - os.mkdir("/tmp/ipa") - shutil.copy("/usr/share/ipa/html/preferences.html", "/tmp/ipa") - + tmpdir = tempfile.mkdtemp(prefix = "tmp-") + shutil.copy("/usr/share/ipa/html/preferences.html", tmpdir) ca.run_signtool(["-k", "Signing-Cert", "-Z", "/usr/share/ipa/html/configure.jar", "-e", ".html", - "/tmp/ipa"]) - shutil.rmtree("/tmp/ipa") + tmpdir]) + shutil.rmtree(tmpdir) -- cgit