Merge "Remove extraneous db method image_property_update"

This commit is contained in:
Jenkins 2012-09-28 21:30:10 +00:00 committed by Gerrit Code Review
commit c5a1635a6b

View File

@ -640,7 +640,7 @@ def _set_properties_for_image(context, image_ref, properties,
'value': value} 'value': value}
if name in orig_properties: if name in orig_properties:
prop_ref = orig_properties[name] prop_ref = orig_properties[name]
image_property_update(context, prop_ref, prop_values, _image_property_update(context, prop_ref, prop_values,
session=session) session=session)
else: else:
image_property_create(context, prop_values, session=session) image_property_create(context, prop_values, session=session)
@ -658,11 +658,6 @@ def image_property_create(context, values, session=None):
return _image_property_update(context, prop_ref, values, session=session) return _image_property_update(context, prop_ref, values, session=session)
def image_property_update(context, prop_ref, values, session=None):
"""Update an ImageProperty object"""
return _image_property_update(context, prop_ref, values, session=session)
def _image_property_update(context, prop_ref, values, session=None): def _image_property_update(context, prop_ref, values, session=None):
""" """
Used internally by image_property_create and image_property_update Used internally by image_property_create and image_property_update