diff options
Diffstat (limited to 'delivery_merge/merge.py')
| -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() |