Handle multiline output better

2026-04-09 21:59:58 +08:00 · 2017-08-03 23:08:34 +02:00
parent 23ce12a099
commit 457664184c
1 changed files with 1 additions and 1 deletions
--- 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