KVM SR: add fallback in case of download exception.

de8d7962 · Cédric de Saint Martin · 0b3ad5c2 · de8d7962
Commit de8d7962 authored Sep 24, 2013 by Cédric de Saint Martin
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

slapos/recipe/kvm/template/kvm_run.in slapos/recipe/kvm/template/kvm_run.in +5 -1

No files found.
--- a/slapos/recipe/kvm/template/kvm_run.in
+++ b/slapos/recipe/kvm/template/kvm_run.in
@@ -60,7 +60,11 @@ def getSocketStatus(host, port):
 # Download existing hard drive if needed at first boot
 if not os.path.exists(disk_path) and virtual_hard_drive_url != '':
  print('Downloading virtual hard drive...')
-  urllib.urlretrieve(virtual_hard_drive_url, disk_path)
+  try:
+    urllib.urlretrieve(virtual_hard_drive_url, disk_path)
+  except:
+    os.remove(disk_path)
+    raise
  md5sum = virtual_hard_drive_md5sum.strip()
  if md5sum:
    print('Checking MD5 checksum...')