From 24684bbb04fd2785eaad12e69261812839adcfd7 Mon Sep 17 00:00:00 2001
From: Nikos Skalkotos <skalkoto@grnet.gr>
Date: Fri, 27 Jul 2012 20:17:02 +0300
Subject: [PATCH] Change kamaki account & token retrieval interface

---
 image_creator/dialog_main.py    |   17 +++++++++++------
 image_creator/kamaki_wrapper.py |   10 ++++++----
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/image_creator/dialog_main.py b/image_creator/dialog_main.py
index 230673c..1bc0ec5 100644
--- a/image_creator/dialog_main.py
+++ b/image_creator/dialog_main.py
@@ -366,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>"
@@ -782,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
@@ -812,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)
 
@@ -873,9 +880,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)
diff --git a/image_creator/kamaki_wrapper.py b/image_creator/kamaki_wrapper.py
index 768e6b3..3e34095 100644
--- a/image_creator/kamaki_wrapper.py
+++ b/image_creator/kamaki_wrapper.py
@@ -46,12 +46,14 @@ CONTAINER = "images"
 class Kamaki(object):
 
     @staticmethod
-    def saved_credentials():
+    def get_account():
         config = Config()
-        account = config.get('storage', 'account')
-        token = config.get('global', 'token')
+        return config.get('storage', 'account')
 
-        return (account, token)
+    @staticmethod
+    def get_token():
+        config = Config()
+        return config.get('global', 'token')
 
     @staticmethod
     def save_account(account):
-- 
1.7.10.4