From d5501234cfc434fbb4b959b63822598a1a68b88b Mon Sep 17 00:00:00 2001
From: Bilal Akhtar <bilalakhtar@ubuntu.com>
Date: Wed, 9 Feb 2011 11:34:23 +0300
Subject: Give a better error message if the instance type specified is
 invalid.

---
 nova/compute/instance_types.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nova/compute/instance_types.py b/nova/compute/instance_types.py
index 196d6a8df..510bfd99e 100644
--- a/nova/compute/instance_types.py
+++ b/nova/compute/instance_types.py
@@ -38,8 +38,8 @@ def get_by_type(instance_type):
     if instance_type is None:
         return FLAGS.default_instance_type
     if instance_type not in INSTANCE_TYPES:
-        raise exception.ApiError(_("Unknown instance type: %s"),
-                                 instance_type)
+        raise exception.ApiError(_("Unknown instance type: %s") % (instance_type),
+                                 "Invalid")
     return instance_type
 
 
-- 
cgit 


From 96fbbcde9c84a72036a74ba07318f31a471eb402 Mon Sep 17 00:00:00 2001
From: Bilal Akhtar <bilalakhtar@ubuntu.com>
Date: Wed, 9 Feb 2011 17:24:36 +0300
Subject: Add my name to AUTHORS, remove parentheses from the substitution made
 in the previous commit

---
 Authors                        | 1 +
 nova/compute/instance_types.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Authors b/Authors
index 27782738f..b359fec22 100644
--- a/Authors
+++ b/Authors
@@ -3,6 +3,7 @@ Anne Gentle <anne@openstack.org>
 Anthony Young <sleepsonthefloor@gmail.com>
 Antony Messerli <ant@openstack.org>
 Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
+Bilal Akhtar <bilalakhtar@ubuntu.com>
 Chiradeep Vittal <chiradeep@cloud.com>
 Chmouel Boudjnah <chmouel@chmouel.com>
 Chris Behrens <cbehrens@codestud.com>
diff --git a/nova/compute/instance_types.py b/nova/compute/instance_types.py
index 510bfd99e..a41f5fa79 100644
--- a/nova/compute/instance_types.py
+++ b/nova/compute/instance_types.py
@@ -38,7 +38,7 @@ def get_by_type(instance_type):
     if instance_type is None:
         return FLAGS.default_instance_type
     if instance_type not in INSTANCE_TYPES:
-        raise exception.ApiError(_("Unknown instance type: %s") % (instance_type),
+        raise exception.ApiError(_("Unknown instance type: %s") % instance_type,
                                  "Invalid")
     return instance_type
 
-- 
cgit 


From 216822bdda290f964020134599749ebbadc76566 Mon Sep 17 00:00:00 2001
From: Bilal Akhtar <bilalakhtar@ubuntu.com>
Date: Thu, 10 Feb 2011 13:08:25 +0300
Subject: Wrap line to under 79 characters

---
 nova/compute/instance_types.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nova/compute/instance_types.py b/nova/compute/instance_types.py
index a41f5fa79..309313fd0 100644
--- a/nova/compute/instance_types.py
+++ b/nova/compute/instance_types.py
@@ -38,8 +38,8 @@ def get_by_type(instance_type):
     if instance_type is None:
         return FLAGS.default_instance_type
     if instance_type not in INSTANCE_TYPES:
-        raise exception.ApiError(_("Unknown instance type: %s") % instance_type,
-                                 "Invalid")
+        raise exception.ApiError(_("Unknown instance type: %s") % \
+                                 instance_type, "Invalid")
     return instance_type
 
 
-- 
cgit