Merge "Set purge-props header correctly in image update"

2014-06-24 15:00:22 +00:00
parent e82f773385 cddc37dcab
commit e62ed4d267
2 changed files with 18 additions and 8 deletions
@@ -305,13 +305,12 @@ class ImageManager(base.ManagerWithFind):
                kwargs.setdefault('size', image_size)

        hdrs = {}
-        try:
-            purge_props = 'true' if kwargs.pop('purge_props') else 'false'
-        except KeyError:
-            pass
-        else:
-            hdrs['x-glance-registry-purge-props'] = purge_props
+        purge_props = 'false'
+        purge_props_bool = kwargs.pop('purge_props', None)
+        if purge_props_bool:
+            purge_props = 'true'

+        hdrs['x-glance-registry-purge-props'] = purge_props
        fields = {}
        for field in kwargs:
            if field in UPDATE_PARAMS: