From 6d1361c9f41b20b3b95223d76fc4bfd8d6df7782 Mon Sep 17 00:00:00 2001
From: Brian Waldon <brian.waldon@rackspace.com>
Date: Mon, 8 Aug 2011 11:44:41 -0400
Subject: [PATCH] cleaning up boot output; upping version

---
 docs/conf.py             |  4 ++--
 novaclient/v1_1/shell.py | 16 +++++++++++++++-
 setup.py                 |  2 +-
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 21316fc8a..722419cbe 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -45,9 +45,9 @@ copyright = u'Rackspace, based on work by Jacob Kaplan-Moss'
 # built documents.
 #
 # The short X.Y version.
-version = '2.5'
+version = '2.6'
 # The full version, including alpha/beta/rc tags.
-release = '2.5.9'
+release = '2.6.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/novaclient/v1_1/shell.py b/novaclient/v1_1/shell.py
index dfa26a14e..5b004c680 100644
--- a/novaclient/v1_1/shell.py
+++ b/novaclient/v1_1/shell.py
@@ -121,7 +121,21 @@ def do_boot(cs, args):
                                     files=files,
                                     min_count=min_count,
                                     max_count=max_count)
-    utils.print_dict(server._info)
+
+    info = server._info
+
+    flavor = info.get('flavor', {})
+    flavor_id = flavor.get('id', '')
+    info['flavor'] = _find_flavor(cs, flavor_id).name
+
+    image = info.get('image', {})
+    image_id = image.get('id', '')
+    info['image'] = _find_image(cs, image_id).name
+
+    info.pop('links', None)
+    info.pop('addresses', None)
+
+    utils.print_dict(info)
 
 
 @utils.arg('--flavor',
diff --git a/setup.py b/setup.py
index 9d2d579f2..b6e6720c4 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@ if sys.version_info < (2, 6):
 
 setup(
     name = "python-novaclient",
-    version = "2.6.0",
+    version = "2.6.1",
     description = "Client library for OpenStack Nova API",
     long_description = read('README.rst'),
     url = 'https://github.com/rackspace/python-novaclient',