revamped spacing per Rick Harris suggestion. Added exact error to nova-manage output.

2 files changed, 3 insertions, 2 deletions

diff --git a/bin/nova-manage b/bin/nova-manage
index 8ec3a1e64..6b47cc4f5 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -833,6 +833,7 @@ class InstanceTypeCommands(object):
             sys.exit(1)
         except exception.ApiError, e:
             print "\n\n"
+            print "\n%s" % e
             print "Please ensure instance_type name and flavorid are unique."
             print "To complete remove a instance_type, use the --purge flag:"
             print "\n     # nova-manage instance_type delete <name> --purge\n"
diff --git a/nova/compute/instance_types.py b/nova/compute/instance_types.py
index a92e5d3bc..6accf82bb 100644
--- a/nova/compute/instance_types.py
+++ b/nova/compute/instance_types.py
@@ -56,8 +56,8 @@ def create(name, memory, vcpus, local_gb, flavorid, swap=0,
                     rxtx_cap=rxtx_cap))
     except exception.DBError, e:
         LOG.exception(_('DB error: %s') % e)
-        raise exception.ApiError(_("Cannot create instance_type with\
-                                    name %(name)s and flavorid %(flavorid)s") %
+        raise exception.ApiError(_("Cannot create instance_type with "
+                                    "name %(name)s and flavorid %(flavorid)s") %
                                     locals())