diff options
| author | Joffrey F <joffrey@docker.com> | 2016-09-06 14:58:41 -0700 |
|---|---|---|
| committer | Joffrey F <joffrey@docker.com> | 2016-09-06 15:17:36 -0700 |
| commit | 219a8699f9c92de9cb4634d482ce700bb1ec76fc (patch) | |
| tree | 948be2b02ecc6c700aa59c33cf58bc45273a9978 /docker/auth/auth.py | |
| parent | fbe1686e629804fb47dabea1eda5c6d664f0a6b7 (diff) | |
| download | docker-py-credstore-support.tar.gz | |
Better credentials store error handling in resolve_authconfigcredstore-support
Signed-off-by: Joffrey F <joffrey@docker.com>
Diffstat (limited to 'docker/auth/auth.py')
| -rw-r--r-- | docker/auth/auth.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/docker/auth/auth.py b/docker/auth/auth.py index fdaa7b5..ea15def 100644 --- a/docker/auth/auth.py +++ b/docker/auth/auth.py @@ -106,8 +106,6 @@ def _resolve_authconfig_credstore(authconfig, registry, credstore_name): # docker.io - in that case, it seems the full URL is necessary. registry = 'https://index.docker.io/v1/' log.debug("Looking for auth entry for {0}".format(repr(registry))) - if registry not in authconfig: - log.debug("No entry found") store = dockerpycreds.Store(credstore_name) try: data = store.get(registry) @@ -122,10 +120,13 @@ def _resolve_authconfig_credstore(authconfig, registry, credstore_name): 'Password': data['Secret'], }) return res + except dockerpycreds.CredentialsNotFound as e: + log.debug('No entry found') + return None except dockerpycreds.StoreError as e: - log.error('Credentials store error: {0}'.format(repr(e))) - - return None + raise errors.DockerException( + 'Credentials store error: {0}'.format(repr(e)) + ) def convert_to_hostname(url): |