From 457664184cdcea01d996f3a9ff689f937e3a16a9 Mon Sep 17 00:00:00 2001 From: Jakub Kadlcik Date: Thu, 3 Aug 2017 23:08:34 +0200 Subject: [PATCH] Handle multiline output better --- module_build_service/builder/CoprModuleBuilder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module_build_service/builder/CoprModuleBuilder.py b/module_build_service/builder/CoprModuleBuilder.py index d10c058e..b1cd935f 100644 --- a/module_build_service/builder/CoprModuleBuilder.py +++ b/module_build_service/builder/CoprModuleBuilder.py @@ -347,7 +347,7 @@ def rmdir(path): def git_branch_contains(cod, commit): cmd = ["git", "branch", "-r", "--contains", commit, "--sort", "-committerdate"] out, err = execute_cmd(cmd, cwd=cod, stdout=subprocess.PIPE, stderr=subprocess.PIPE) - branch = out.strip().split("/")[1] + branch = out.split()[0].split("/")[1] if " -> " in branch: branch = branch.split(" -> ")[0] return branch