Add validate

[karesansui/karesansui.git] / bin / destroy_guest.py

diff --git a/bin/destroy_guest.py b/bin/destroy_guest.py
index df74629..1ccc8a7 100755 (executable)
--- a/bin/destroy_guest.py
+++ b/bin/destroy_guest.py
@@ -53,7 +53,7 @@ class DestroyGuest(KssCommand):
         conn = KaresansuiVirtConnection(readonly=False)
         try:
             conn.set_domain_name(opts.name)
-    
+
             active_guests = conn.list_active_guest()
             inactive_guests = conn.list_inactive_guest()
             if opts.name in active_guests or opts.name in inactive_guests:
@@ -61,24 +61,22 @@ class DestroyGuest(KssCommand):
                     self.up_progress(10)
                     conn.destroy_guest()
                     self.up_progress(40)
-                except:
+                except Exception, e:
                     self.logger.error('Failed to destroy guest. - dom=%s' % (opts.name))
                     print >>sys.stderr, _('Failed to destroy guest. - dom=%s') % (opts.name)
-                    raise
-                    
+                    raise e
+
                 status = conn.guest.status()
 
                 self.up_progress(10)
 
                 if status == VIR_DOMAIN_SHUTOFF or status == VIR_DOMAIN_SHUTDOWN:
                     self.logger.info('Succeeded to destroy guest. - dom=%s' % (opts.name))
-                    print >>sys.stderr, _('Succeeded to destroy guest. - dom=%s') % (opts.name)
+                    print >>sys.stdout, _('Succeeded to destroy guest. - dom=%s') % (opts.name)
 
             else:
-                #self.logger.error('guest not found. - dom=%s' % (opts.name))
-                #print >>sys.stderr, _('guest not found. - dom=%s') % (opts.name)
                 raise KssCommandException(
-                    'guest not found. - dom=%s' % (opts.name))
+                    'Guest not found. - dom=%s' % (opts.name))
 
             return True
         finally: