Sync updates, merge branch 'master' into api_refactoring

This commit is contained in:
Rohit Yadav 2013-01-06 17:52:51 -08:00
commit 3c1ccdf604

View File

@ -95,7 +95,7 @@ class CloudMonkeyShell(cmd.Cmd, object):
print "Please fix `%s` config in %s" % (key, self.config_file) print "Please fix `%s` config in %s" % (key, self.config_file)
sys.exit() sys.exit()
self.prompt += " " # Cosmetic fix for prompt self.prompt = self.prompt.strip() + " " # Cosmetic fix for prompt
logging.basicConfig(filename=self.log_file, logging.basicConfig(filename=self.log_file,
level=logging.DEBUG, format=log_fmt) level=logging.DEBUG, format=log_fmt)
logger.debug("Loaded config fields:\n%s" % self.config_fields) logger.debug("Loaded config fields:\n%s" % self.config_fields)
@ -421,7 +421,7 @@ class CloudMonkeyShell(cmd.Cmd, object):
args = args.strip().partition(" ") args = args.strip().partition(" ")
key, value = (args[0], args[2]) key, value = (args[0], args[2])
setattr(self, key, value) # keys and attributes should have same names setattr(self, key, value) # keys and attributes should have same names
self.prompt += " " # prompt fix self.prompt = self.prompt.strip() + " " # prompt fix
self.write_config() self.write_config()
def complete_set(self, text, line, begidx, endidx): def complete_set(self, text, line, begidx, endidx):