diff options
| author | Joseph Hunkeler <jhunkeler@gmail.com> | 2019-05-07 14:08:56 -0400 |
|---|---|---|
| committer | Joseph Hunkeler <jhunkeler@gmail.com> | 2019-05-07 14:08:56 -0400 |
| commit | 2cee43c16f2a5457f94876f527a4c34b71d93445 (patch) | |
| tree | 0e3a6648c51cb9a20b076a37cb3dea1f2ee0c319 /delivery_merge | |
| parent | 593537b7183adb0b4371ee19d6c6bd583267d305 (diff) | |
| download | delivery_merge-2cee43c16f2a5457f94876f527a4c34b71d93445.tar.gz | |
Strip whitespace after stripping comment
Diffstat (limited to 'delivery_merge')
| -rw-r--r-- | delivery_merge/merge.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/delivery_merge/merge.py b/delivery_merge/merge.py index 01b9732..792c90f 100644 --- a/delivery_merge/merge.py +++ b/delivery_merge/merge.py @@ -39,7 +39,7 @@ def dmfile(filename): comment_pos = comment_find(line) if comment_pos >= 0: - line = line[:comment_pos] + line = line[:comment_pos].strip() if not line: continue @@ -72,6 +72,7 @@ def env_combine(filename, conda_env, conda_channels=[]): conda_env, channels_result, packages_result) if proc.stderr: print(proc.stderr.decode()) + proc.check_returncode() |