git://git.onelab.eu
/
bootmanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- greatly simplify (and fix in the process) parsing of lspci output
[bootmanager.git]
/
source
/
BootServerRequest.py
diff --git
a/source/BootServerRequest.py
b/source/BootServerRequest.py
index
b2f03a1
..
efe3d9c
100644
(file)
--- a/
source/BootServerRequest.py
+++ b/
source/BootServerRequest.py
@@
-214,10
+214,15
@@
class BootServerRequest:
MaxTransferTime= DEFAULT_CURL_MAX_TRANSFER_TIME,
FormData= None):
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,
ok = self.DownloadFile(PartialPath, GetVars, PostVars,
- DoSSL, DoCertCheck, buffer
.
name,
+ DoSSL, DoCertCheck, buffer
_
name,
ConnectTimeout,
MaxTransferTime,
FormData)
ConnectTimeout,
MaxTransferTime,
FormData)
@@
-402,7
+407,7
@@
class BootServerRequest:
if not outfile.closed:
try:
os.unlink(DestFilePath)
if not outfile.closed:
try:
os.unlink(DestFilePath)
- outfile.close
+ outfile.close
()
except OSError:
pass
except OSError:
pass