Check file is not block if type = file. Check os_type specified before validating os_variant. Error message fix in if no valid distro found at install source.

Author: crobinso

virtinst/DistroManager.py

@@ -77,7 +77,7 @@ def _storeForDistro(fetcher, baseuri, type, progresscb, distro=None, scratchdir=
         if store.isValidStore(fetcher, progresscb):
             return store
 
-    raise ValueError, _("Could not find an installable distribution the install location")
+    raise ValueError, _("Could not find an installable distribution at '%s'" % baseuri) 
 
 
 # Method to fetch a krenel & initrd pair for a particular distro / HV type

virtinst/FullVirtGuest.py

@@ -148,6 +148,8 @@ def set_os_type(self, val):
     def get_os_variant(self):
         return self._os_variant
     def set_os_variant(self, val):
+        if not self._os_type:
+            raise ValueError, _("An OS type must be specified before a variant.")
         if FullVirtGuest.OS_TYPES[self._os_type]["variants"].has_key(val):
             self._os_variant = val
         else:

virtinst/Guest.py

@@ -95,6 +95,9 @@ def __init__(self, path = None, size = None, transient=False, type=None, device=
                 if self.size is None and not os.path.exists(self.path):
                     raise ValueError, \
                         _("A size must be provided for non-existent disks")
+                if os.path.exists(self.path) and \
+                   stat.S_ISBLK(os.stat(self.path)[stat.ST_MODE]):
+                    raise ValueError, _("The specified path is a block device, not a regular file.")
                 if self.size is not None and \
                    (__builtin__.type(self.size) is not __builtin__.type(1) and __builtin__.type(self.size) is not __builtin__.type(1.0)):
                     raise ValueError, _("Disk size must be an int or a float.")