|
|
@ -171,7 +171,7 @@ def main():
|
|
|
|
msc.existing = msc.get_obj(path, id=user_id)
|
|
|
|
msc.existing = msc.get_obj(path, id=user_id)
|
|
|
|
existing_by_name = msc.get_obj(path, username=user_name)
|
|
|
|
existing_by_name = msc.get_obj(path, username=user_name)
|
|
|
|
if existing_by_name and user_id != existing_by_name['id']:
|
|
|
|
if existing_by_name and user_id != existing_by_name['id']:
|
|
|
|
msc.fail_json(msg="Provided user '{1}' with id '{2}' does not match existing id '{3}'.".format(user_name, user_id, existing_by_name['id']))
|
|
|
|
msc.fail_json(msg="Provided user '{0}' with id '{1}' does not match existing id '{2}'.".format(user_name, user_id, existing_by_name['id']))
|
|
|
|
|
|
|
|
|
|
|
|
# If we found an existing object, continue with it
|
|
|
|
# If we found an existing object, continue with it
|
|
|
|
if user_id:
|
|
|
|
if user_id:
|
|
|
|