Merged with trunk

1 files changed, 5 insertions, 4 deletions

diff --git a/bin/nova-manage b/bin/nova-manage
index 563b2d11d..1178841ed 100755
--- a/bin/nova-manage
+++ b/bin/nova-manage
@@ -726,8 +726,7 @@ class NetworkCommands(object):
                 network_size = FLAGS.network_size
                 subnet = 32 - int(math.log(network_size, 2))
                 oversize_msg = _('Subnet(s) too large, defaulting to /%s.'
-                                 '  To override, specify network_size flag.'
-                                ) % subnet
+                         '  To override, specify network_size flag.') % subnet
                 print oversize_msg
             else:
                 network_size = fixnet.size
@@ -1122,10 +1121,12 @@ class InstanceTypeCommands(object):
 
     @args('--name', dest='name', metavar='<name>',
             help='Name of instance type/flavor')
-    def delete(self, name, purge=None):
+    @args('--purge', action="store_true", dest='purge', default=False,
+            help='purge record from database')
+    def delete(self, name, purge):
         """Marks instance types / flavors as deleted"""
         try:
-            if purge == "--purge":
+            if purge:
                 instance_types.purge(name)
                 verb = "purged"
             else: