From a2c9c16b5d57e80c1bf6fe8e7c80d7dbc9c27fde Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Sun, 12 May 2019 12:48:57 -0400 Subject: Having a git log is not good enough --- 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 8c0148f..e146af6 100644 --- a/delivery_merge/merge.py +++ b/delivery_merge/merge.py @@ -111,8 +111,9 @@ def testable_packages(filename, prefix): info_d = os.path.join(root, 'info') recipe_d = os.path.join(info_d, 'recipe') git_log = os.path.join(info_d, 'git') + git_log_data = open(git_log).readlines() or [] - if not os.path.exists(git_log): + if not os.path.exists(git_log) or not git_log_data: continue with open(os.path.join(recipe_d, 'meta.yaml')) as yaml_data: -- cgit