From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Wed, 21 Jun 2006 18:13:25 +0000 (+0000)
Subject: - support version 2 boot CDs that do not have tempfile.NamedTemporaryFile
X-Git-Tag: myplc-0_4-rc1~4
X-Git-Url: http://git.onelab.eu/?p=bootmanager.git;a=commitdiff_plain;h=016899f9709bce727a388fb1f4ec12edb5d030d6

- support version 2 boot CDs that do not have tempfile.NamedTemporaryFile
---

diff --git a/source/BootServerRequest.py b/source/BootServerRequest.py
index b2f03a1..efe3d9c 100644
--- a/source/BootServerRequest.py
+++ b/source/BootServerRequest.py
@@ -214,10 +214,15 @@ class BootServerRequest:
                      MaxTransferTime= DEFAULT_CURL_MAX_TRANSFER_TIME,
                      FormData= None):
 
-        buffer = tempfile.NamedTemporaryFile()
+        if hasattr(tempfile, "NamedTemporaryFile"):
+            buffer = tempfile.NamedTemporaryFile()
+            buffer_name = buffer.name
+        else:
+            buffer_name = tempfile.mktemp("MakeRequest")
+            buffer = open(buffer_name, "w+")
 
         ok = self.DownloadFile(PartialPath, GetVars, PostVars,
-                               DoSSL, DoCertCheck, buffer.name,
+                               DoSSL, DoCertCheck, buffer_name,
                                ConnectTimeout,
                                MaxTransferTime,
                                FormData)
@@ -402,7 +407,7 @@ class BootServerRequest:
                 if not outfile.closed:
                     try:
                         os.unlink(DestFilePath)
-                        outfile.close
+                        outfile.close()
                     except OSError:
                         pass