cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject git commit: cloudmonkey: re-initialize credentials for all set events
Date Sat, 23 Aug 2014 11:34:04 GMT
Repository: cloudstack-cloudmonkey
Updated Branches:
  refs/heads/master 29695f974 -> 0ba0c90e1


cloudmonkey: re-initialize credentials for all set events

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/commit/0ba0c90e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/tree/0ba0c90e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/diff/0ba0c90e

Branch: refs/heads/master
Commit: 0ba0c90e1135c957fb96b56cde295f5fdfcd6c16
Parents: 29695f9
Author: Rohit Yadav <rohit.yadav@shapeblue.com>
Authored: Sat Aug 23 13:32:39 2014 +0200
Committer: Rohit Yadav <rohit.yadav@shapeblue.com>
Committed: Sat Aug 23 13:32:39 2014 +0200

----------------------------------------------------------------------
 cloudmonkey/cloudmonkey.py | 4 ++--
 cloudmonkey/requester.py   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/blob/0ba0c90e/cloudmonkey/cloudmonkey.py
----------------------------------------------------------------------
diff --git a/cloudmonkey/cloudmonkey.py b/cloudmonkey/cloudmonkey.py
index 5130f12..7de3dff 100644
--- a/cloudmonkey/cloudmonkey.py
+++ b/cloudmonkey/cloudmonkey.py
@@ -428,9 +428,9 @@ class CloudMonkeyShell(cmd.Cmd, object):
             print "This option has been deprecated, please set 'url' instead"
             print "This server url will be used:", self.url
         write_config(self.get_attr, self.config_file)
+        read_config(self.get_attr, self.set_attr, self.config_file)
+        self.init_credential_store()
         if key.strip() == 'profile':
-            read_config(self.get_attr, self.set_attr, self.config_file)
-            self.init_credential_store()
             print "\nLoaded server profile '%s' with options:" % key
             for option in default_profile.keys():
                 print "    %s = %s" % (option, self.get_attr(option))

http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/blob/0ba0c90e/cloudmonkey/requester.py
----------------------------------------------------------------------
diff --git a/cloudmonkey/requester.py b/cloudmonkey/requester.py
index d6d193b..5a9b7ec 100644
--- a/cloudmonkey/requester.py
+++ b/cloudmonkey/requester.py
@@ -187,7 +187,7 @@ def make_request(command, args, logger, url,
         connection = urllib2.urlopen(request_url)
         response = connection.read()
     except HTTPError, e:
-        error = "%s: %s" % (e.msg, e.info().getheader('X-Description'))
+        error = "Error:%s %s" % (e.msg, e.info().getheader('X-Description'))
     except URLError, e:
         error = e.reason
 


Mime
View raw message