docker
/
docker-py
mirror of https://github.com/docker/docker-py.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1146 from aanand/config-path-debug 

More explicit debug for config path logic
This commit is contained in:
Joffrey F 2016-08-01 10:59:32 -07:00 committed by GitHub
parent 8a6b1843c3 f006da6a43
commit f99dc45d82
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
docker/auth/auth.py
View File

@ -160,18 +160,24 @@ def find_config_file(config_path=None):
os.path.basename(DOCKER_CONFIG_FILENAME) os.path.basename(DOCKER_CONFIG_FILENAME)
) if os.environ.get('DOCKER_CONFIG') else None ) if os.environ.get('DOCKER_CONFIG') else None
paths = [ paths = filter(None, [
config_path, # 1 config_path, # 1
environment_path, # 2 environment_path, # 2
os.path.join(os.path.expanduser('~'), DOCKER_CONFIG_FILENAME), # 3 os.path.join(os.path.expanduser('~'), DOCKER_CONFIG_FILENAME), # 3
os.path.join( os.path.join(
os.path.expanduser('~'), LEGACY_DOCKER_CONFIG_FILENAME os.path.expanduser('~'), LEGACY_DOCKER_CONFIG_FILENAME
) # 4 ) # 4
] ])
log.debug("Trying paths: {0}".format(repr(paths)))
for path in paths: for path in paths:
if path and os.path.exists(path): if os.path.exists(path):
log.debug("Found file at path: {0}".format(path))
return path return path
log.debug("No config file found")
return None return None
@ -186,7 +192,6 @@ def load_config(config_path=None):
config_file = find_config_file(config_path) config_file = find_config_file(config_path)
if not config_file: if not config_file:
log.debug("File doesn't exist")
return {} return {}
try: try: