Remove an unused import in main.py

[snf-image-creator] / image_creator / dialog_main.py

diff --git a/image_creator/dialog_main.py b/image_creator/dialog_main.py
index 52b463f..6513344 100644 (file)
--- a/image_creator/dialog_main.py
+++ b/image_creator/dialog_main.py
@@ -48,6 +48,7 @@ from image_creator.disk import Disk
 from image_creator.os_type import os_cls
 from image_creator.kamaki_wrapper import Kamaki, ClientError
 from image_creator.help import get_help_file
+from image_creator.dialog_wizard import wizard
 
 MSGBOX_WIDTH = 60
 YESNO_WIDTH = 50
@@ -365,7 +366,14 @@ def kamaki_menu(session):
     d = session['dialog']
     default_item = "Account"
 
-    (session['account'], session['token']) = Kamaki.saved_credentials()
+    account = Kamaki.get_account()
+    if account:
+        session['account'] = account
+
+    token = Kamaki.get_token()
+    if token:
+        session['token'] = token
+
     while 1:
         account = session["account"] if "account" in session else "<none>"
         token = session["token"] if "token" in session else "<none>"
@@ -781,7 +789,7 @@ def select_file(d, media):
     while 1:
         if media is not None:
             if not os.path.exists(media):
-                d.msgbox("The file you choose does not exist",
+                d.msgbox("The file `%s' you choose does not exist." % media,
                          width=MSGBOX_WIDTH)
             else:
                 break
@@ -798,10 +806,6 @@ def select_file(d, media):
     return media
 
 
-def wizard(session):
-    pass
-
-
 def image_creator(d):
 
     usage = "Usage: %prog [options] [<input_media>]"
@@ -815,7 +819,7 @@ def image_creator(d):
     d.setBackgroundTitle('snf-image-creator')
 
     if os.geteuid() != 0:
-        raise FatalError("You must run %s as root" % basename)
+        raise FatalError("You must run %s as root" % parser.get_prog_name())
 
     media = select_file(d, args[0] if len(args) == 1 else None)
 
@@ -867,6 +871,8 @@ def image_creator(d):
               % (dev.ostype if dev.ostype == dev.distro else "%s/%s" %
                  (dev.distro, dev.ostype))
 
+        update_background_title(session)
+
         while True:
             code = d.yesno(msg, width=YESNO_WIDTH, height=12)
             if code == d.DIALOG_OK:
@@ -876,9 +882,7 @@ def image_creator(d):
                 main_menu(session)
                 break
 
-            exit_msg = "You have not selected if you want to run " \
-                       "snf-image-creator in wizard or expert mode."
-            if confirm_exit(d, exit_msg):
+            if confirm_exit(d):
                 break
 
         d.infobox("Thank you for using snf-image-creator. Bye", width=53)