x-move/iconograph
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

More reliable cleanup

Browse Source
This commit is contained in:
Ian Gulliver
2016-05-10 20:55:50 +00:00
parent 927b851b06
commit f43e9913e9
2 changed files with 33 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/fetcher.py
View File

@@ -130,8 +130,8 @@ class Fetcher(object):
resp = self._session.get(url, stream=True) resp = self._session.get(url, stream=True)
hash_obj = hashlib.sha256() hash_obj = hashlib.sha256()
with tempfile.NamedTemporaryFile(dir=self._image_dir, delete=False) as fh:
try: try:
fh = tempfile.NamedTemporaryFile(dir=self._image_dir, delete=False)
for data in resp.iter_content(self._BUF_SIZE): for data in resp.iter_content(self._BUF_SIZE):
hash_obj.update(data) hash_obj.update(data)
fh.write(data) fh.write(data)

5
client/update_grub.py
View File

@@ -32,8 +32,8 @@ class GrubUpdater(object):
def Update(self): def Update(self):
grub_dir = os.path.join(self._boot_dir, 'grub') grub_dir = os.path.join(self._boot_dir, 'grub')
# TODO: clean up if we fail here
with tempfile.NamedTemporaryFile('w', dir=grub_dir, delete=False) as fh: with tempfile.NamedTemporaryFile('w', dir=grub_dir, delete=False) as fh:
try:
current = os.readlink(os.path.join(self._image_dir, 'current')) current = os.readlink(os.path.join(self._image_dir, 'current'))
fh.write(""" fh.write("""
@@ -68,3 +68,6 @@ menuentry "%(image_filename)s (%(volume_id)s)" --hotkey=%(hotkey)s {
fh.flush() fh.flush()
os.rename(fh.name, os.path.join(grub_dir, 'grub.cfg')) os.rename(fh.name, os.path.join(grub_dir, 'grub.cfg'))
except:
os.unlink(fh.name)
raise