Changeset 2974 for trunk

Timestamp:

Jan 31, 2010, 9:14:30 PM (15 years ago)

Author:

gdb

Message:

Add status messages; continue after failed downloads.

Location:

trunk/packages/invirt-images

Files:

• debian/changelog (modified) (1 diff)
• invirt-images (modified) (3 diffs)

trunk/packages/invirt-images/debian/changelog

@@ +1 @@
+invirt-images (0.0.3) unstable; urgency=low
+
+  * Add status messages; continue after failed downloads. 
+
+ -- Quentin Smith <quentin@mit.edu>  Sun, 31 Jan 2010 21:13:32 -0500
+
 invirt-images (0.0.2) unstable; urgency=low
 

trunk/packages/invirt-images/invirt-images

@@ -3 +3 @@
 from invirt import database
 import os
+import sys
 import subprocess
 import random
@@ -110 +111 @@
     full_uri = os.path.join(cdrom.mirror.uri_prefix, cdrom.uri_suffix)
     temp_file = tempfile.mkstemp()[1]
+    if verbosity > 0:
+        print >>sys.stderr, "Fetching image %s from %s to %s" % (cdrom.cdrom_id, full_uri, temp_file)
     try:
         if full_uri.startswith('rsync://'):
@@ -142 +145 @@
     temp_file = fetch_image(cdrom)
     try:
-        cdrom_size = '%sM' % math.ceil((float(os.stat(temp_file).st_size) / (1024 * 1024)))
+        st_size = os.stat(temp_file).st_size
+        if not st_size:
+            print >>sys.stderr, "Failed to fetch %s" % cdrom.cdrom_id
+            return
+        cdrom_size = '%sM' % math.ceil((float(st_size) / (1024 * 1024)))
         new_lv = lvcreate_random('image-new_%s_%%s' % cdrom.cdrom_id, cdrom_size)
         copy_file(temp_file, '/dev/xenvg/%s' % new_lv)