From 2cee43c16f2a5457f94876f527a4c34b71d93445 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Tue, 7 May 2019 14:08:56 -0400 Subject: Strip whitespace after stripping comment --- delivery_merge/merge.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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() -- cgit