diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-07-07 20:56:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-07-07 20:56:18 +0000 |
| commit | ffb232a90e8b5c8358e017bf057a045a2d59bbfc (patch) | |
| tree | 4900840df82bb3151d997aee85610df0ecc4ac4a /openstackclient/identity/v3/user.py | |
| parent | 2adeac2bc2421a96273dfbc2b39a43cc06e542e6 (diff) | |
| parent | 6f36385cb87d04577d60032f6e74c732edab6d45 (diff) | |
| download | python-openstackclient-ffb232a90e8b5c8358e017bf057a045a2d59bbfc.tar.gz | |
Merge "Correct reraising of exception"
Diffstat (limited to 'openstackclient/identity/v3/user.py')
| -rwxr-xr-x[-rw-r--r--] | openstackclient/identity/v3/user.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/openstackclient/identity/v3/user.py b/openstackclient/identity/v3/user.py index dd5af06a..3e189ac1 100644..100755 --- a/openstackclient/identity/v3/user.py +++ b/openstackclient/identity/v3/user.py @@ -121,14 +121,14 @@ class CreateUser(command.ShowOne): description=parsed_args.description, enabled=enabled ) - except ks_exc.Conflict as e: + except ks_exc.Conflict: if parsed_args.or_show: user = utils.find_resource(identity_client.users, parsed_args.name, domain_id=domain_id) LOG.info(_('Returning existing user %s'), user.name) else: - raise e + raise user._info.pop('links') return zip(*sorted(six.iteritems(user._info))) |