Merge "Fix the remove property logic in V2"

This commit is contained in:
Jenkins
2015-09-14 08:19:22 +00:00
committed by Gerrit Code Review

View File

@@ -252,7 +252,7 @@ class Controller(object):
except warlock.InvalidOperation as e: except warlock.InvalidOperation as e:
raise TypeError(utils.exception_to_str(e)) raise TypeError(utils.exception_to_str(e))
if remove_props is not None: if remove_props:
cur_props = image.keys() cur_props = image.keys()
new_props = kwargs.keys() new_props = kwargs.keys()
# NOTE(esheffield): Only remove props that currently exist on the # NOTE(esheffield): Only remove props that currently exist on the