From bbf54d7a080455a5b4508b292c92f7d7c2f4dbf8 Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Tue, 9 Jul 2013 09:12:26 -0400 Subject: [PATCH] uihelpers: Fix error showing dialog if default pool isn't started --- virtManager/addhardware.py | 2 +- virtManager/create.py | 2 +- virtManager/uihelpers.py | 16 ++++++++-------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/virtManager/addhardware.py b/virtManager/addhardware.py index 99d4e4507..41bc35cdb 100644 --- a/virtManager/addhardware.py +++ b/virtManager/addhardware.py @@ -1268,7 +1268,7 @@ class vmmAddHardware(vmmGObjectUI): # Make sure default pool is running if self.is_default_storage(): - ret = uihelpers.check_default_pool_active(self.topwin, self.conn) + ret = uihelpers.check_default_pool_active(self.err, self.conn) if not ret: return False diff --git a/virtManager/create.py b/virtManager/create.py index 5d9e516a6..b212c844e 100644 --- a/virtManager/create.py +++ b/virtManager/create.py @@ -1642,7 +1642,7 @@ class vmmCreate(vmmGObjectUI): # Make sure default pool is running if self.is_default_storage(): - ret = uihelpers.check_default_pool_active(self.topwin, self.conn) + ret = uihelpers.check_default_pool_active(self.err, self.conn) if not ret: return False diff --git a/virtManager/uihelpers.py b/virtManager/uihelpers.py index 0c093fabf..0247329c0 100644 --- a/virtManager/uihelpers.py +++ b/virtManager/uihelpers.py @@ -116,13 +116,13 @@ def update_host_space(conn, widget): widget.set_markup(hd_label) -def check_default_pool_active(topwin, conn): +def check_default_pool_active(err, conn): default_pool = util.get_default_pool(conn) if default_pool and not default_pool.is_active(): - res = err_dial.yes_no(_("Default pool is not active."), - _("Storage pool '%s' is not active. " - "Would you like to start the pool " - "now?") % default_pool.get_name()) + res = err.yes_no(_("Default pool is not active."), + _("Storage pool '%s' is not active. " + "Would you like to start the pool " + "now?") % default_pool.get_name()) if not res: return False @@ -131,9 +131,9 @@ def check_default_pool_active(topwin, conn): default_pool.start() logging.info("Started pool '%s'", default_pool.get_name()) except Exception, e: - return topwin.err.show_err(_("Could not start storage_pool " - "'%s': %s") % - (default_pool.get_name(), str(e))) + return err.show_err(_("Could not start storage_pool " + "'%s': %s") % + (default_pool.get_name(), str(e))) return True #####################################################