diff options
| author | Jon Cotton <jc@finaltransfer.net> | 2016-11-11 16:24:18 -0800 |
|---|---|---|
| committer | Ben Firshman <ben@firshman.co.uk> | 2016-11-28 19:41:13 +0000 |
| commit | 4a7c772dafb4446fafbd599c8267e0522c138a76 (patch) | |
| tree | c5850388fea0481546c1fe005f721c95eeaccb68 /docker | |
| parent | 4c8c761bc15160be5eaa76d81edda17b067aa641 (diff) | |
| download | docker-py-4a7c772dafb4446fafbd599c8267e0522c138a76.tar.gz | |
Fix parsing for an environment file with newlines
Fixes the new, purposely broken test added in the previous commit.
Signed-off-by: Jon Cotton <jc@finaltransfer.net>
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/utils/utils.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/docker/utils/utils.py b/docker/utils/utils.py index b107f22..45adf3b 100644 --- a/docker/utils/utils.py +++ b/docker/utils/utils.py @@ -1052,7 +1052,11 @@ def parse_env_file(env_file): if line[0] == '#': continue - parse_line = line.strip().split('=', 1) + line = line.strip() + if not line: + continue + + parse_line = line.split('=', 1) if len(parse_line) == 2: k, v = parse_line environment[k] = v |