virt-*: Don't show backtraces for most errors

Additionally, improve some error message cosmetics.

Author: crobinso

virt-clone

@@ -213,40 +213,33 @@ def main():
 
     design = clmgr.CloneDesign(connection=conn)
 
-    try:
-        design.clone_running = options.clone_running
-        get_original_guest(options.original_guest, options.original_xml,
-                           design)
-        get_clone_name(options.new_name, options.auto_clone, design)
-
-        get_clone_macaddr(options.new_mac, design)
-        get_clone_uuid(options.new_uuid, design)
-        get_clone_sparse(options.sparse, design)
-        get_force_target(options.target, design)
-        get_preserve(options.preserve, design)
-
-        # This determines the devices that need to be cloned, so that
-        # get_clone_diskfile knows how many new disk paths it needs
-        design.setup_original()
-
-        get_clone_diskfile(options.new_diskfile, design, conn,
-                           not options.preserve, options.auto_clone)
-
-        # setup design object
-        design.setup()
-
-        # start cloning
-        meter = progress.TextMeter()
-        clmgr.start_duplicate(design, meter)
-
-        print _("\nClone '%s' created successfully.") % design.clone_name
-        logging.debug("end clone")
-    except RuntimeError, e:
-        fail(e)
-    except SystemExit, e:
-        sys.exit(e.code)
-    except Exception, e:
-        fail(e)
+    design.clone_running = options.clone_running
+    get_original_guest(options.original_guest, options.original_xml,
+                       design)
+    get_clone_name(options.new_name, options.auto_clone, design)
+
+    get_clone_macaddr(options.new_mac, design)
+    get_clone_uuid(options.new_uuid, design)
+    get_clone_sparse(options.sparse, design)
+    get_force_target(options.target, design)
+    get_preserve(options.preserve, design)
+
+    # This determines the devices that need to be cloned, so that
+    # get_clone_diskfile knows how many new disk paths it needs
+    design.setup_original()
+
+    get_clone_diskfile(options.new_diskfile, design, conn,
+                       not options.preserve, options.auto_clone)
+
+    # setup design object
+    design.setup()
+
+    # start cloning
+    meter = progress.TextMeter()
+    clmgr.start_duplicate(design, meter)
+
+    print _("\nClone '%s' created successfully.") % design.clone_name
+    logging.debug("end clone")
 
 if __name__ == "__main__":
     try:
@@ -256,6 +249,5 @@ if __name__ == "__main__":
     except KeyboardInterrupt:
         print >> sys.stderr, _("Installation aborted at user request")
     except Exception, main_e:
-        logging.exception(main_e)
-        sys.exit(1)
+        fail(main_e)
 

virt-convert

@@ -276,6 +276,5 @@ if __name__ == "__main__":
     except KeyboardInterrupt:
         print >> sys.stderr, _("Aborted at user request")
     except Exception, main_e:
-        logging.exception(main_e)
-        sys.exit(1)
+        fail(main_e)
 

virt-image

@@ -232,23 +232,26 @@ def main():
         guest._prepare_install(meter)
         guest._create_devices(meter)
         print guest.get_config_xml()
-    else:
-        try:
-            print _("\n\nCreating guest %s...") % guest.name
-
-            dom = guest.start_install(None, progresscb)
-            if dom is None:
-                print _("Guest creation failed")
-                sys.exit(1)
-
-        except RuntimeError, e:
-            fail(e)
-        except Exception, e:
-            print _("Domain creation may not have been\n"
-                   "successful.  If it was, you can restart your domain\n"
-                   "by running 'virsh start %s'; otherwise, please\n"
-                   "restart your installation.") %(guest.name,)
-            raise
+        return
+
+    try:
+        print _("\n\nCreating guest %s...") % guest.name
+
+        dom = guest.start_install(None, progresscb)
+        if dom is None:
+            print _("Guest creation failed")
+            sys.exit(1)
+
+    except RuntimeError:
+        raise
+    except Exception, e:
+        fail(e, do_exit=False)
+        print
+        print _("Domain creation may not have been\n"
+                "successful.  If it was, you can restart your domain\n"
+                "by running 'virsh start %s'; otherwise, please\n"
+                "restart your installation.") %(guest.name,)
+        sys.exit(1)
 
 if __name__ == "__main__":
     try:
@@ -258,6 +261,5 @@ if __name__ == "__main__":
     except KeyboardInterrupt:
         print >> sys.stderr, _("Installation aborted at user request")
     except Exception, main_e:
-        logging.exception(main_e)
-        sys.exit(1)
+        fail(main_e)
 

virt-install

@@ -123,7 +123,6 @@ def parse_boot_option(guest, optstring):
         if menu == None:
             fail(_("--boot menu must be 'on' or 'off'"))
 
-    print menu
     set_param("enable_bootmenu", "menu", menu)
     set_param("kernel", "kernel")
     set_param("initrd", "initrd")
@@ -1010,7 +1009,7 @@ def main():
 
 
     # we've got everything -- try to start the install
-    print _("\n\nStarting install...")
+    print _("\nStarting install...")
 
     try:
         start_time = time.time()
@@ -1048,13 +1047,13 @@ def main():
     except SystemExit, e:
         sys.exit(e.code)
     except Exception, e:
-        logging.error(e)
-        print _("Domain installation does not appear to have been\n "
-                "successful.  If it was, you can restart your domain\n "
-                "by running 'virsh start %s'; otherwise, please\n "
+        fail(e, do_exit=False)
+        print
+        print _("Domain installation does not appear to have been\n"
+                "successful. If it was, you can restart your domain\n"
+                "by running 'virsh start %s'; otherwise, please\n"
                 "restart your installation.") % guest.name
-        raise
-
+        sys.exit(1)
 
 def do_install(guest, conscb, progresscb, wait, wait_time, start_time,
                install_func):
@@ -1141,6 +1140,5 @@ if __name__ == "__main__":
     except KeyboardInterrupt:
         print >> sys.stderr, _("Installation aborted at user request")
     except Exception, main_e:
-        logging.exception(main_e)
-        sys.exit(1)
+        fail(main_e)
 

virtinst/cli.py

@@ -190,11 +190,12 @@ def exception_log(type, val, tb):
     # Log the app command string
     logging.debug("Launched with command line:\n%s" % " ".join(sys.argv))
 
-def fail(msg):
+def fail(msg, do_exit=True):
     """Convenience function when failing in cli app"""
     logging.error(msg)
     _util.log_exception()
-    _fail_exit()
+    if do_exit:
+        _fail_exit()
 
 def _fail_exit():
     sys.exit(1)