x/solar
Code Issues Proposed changes

Merge "Fix typo in Resource._pre_from_dict_check"

Browse Source
This commit is contained in:
Jenkins 2016-03-21 11:47:35 +00:00 committed by Gerrit Code Review
commit 29d3306491
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
solar/dblayer/solar_models.py
View File

@ -836,12 +836,12 @@ class Resource(Model):
# NOTE(jnowak): it's a bit naive implementation, we will
# introduce something smarter instead based on conflict
# resolution.
ret = super(Resource, cls)._pre_from_dict_check(key, data)
key, data = super(Resource, cls)._pre_from_dict_check(key, data)
robj = cls.bucket.get(key)
if robj.exists:
raise DBLayerException("Object already exists in "
"database cannot create second")
return ret
return key, data
def _connect_single(self, other_inputs, other_name, my_name):
if isinstance(other_name, (list, tuple)):