From d478c746fed58784646cbf253a91abfec7c2d3e8 Mon Sep 17 00:00:00 2001 From: Anna Born Date: Thu, 8 Feb 2018 14:32:55 +0100 Subject: [PATCH 1/2] print output from execute command --- buildconf.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/buildconf.py b/buildconf.py index dc5d59b..aa0df82 100644 --- a/buildconf.py +++ b/buildconf.py @@ -117,7 +117,9 @@ def clonePackage(cfg, package, server, gitPackage, branch): cmd = ["git", "clone", "-o", "autobuild", "-q", server+gitPackage, clonePath] if branch: cmd += ["-b", branch] - execute.do(cmd, cfg) + out, err, r = execute.do(cmd, cfg) + print out + print err # apply patch if we have one patch = cfg["pyScriptDir"] + "/patches/" + package.split("/")[-1] + ".patch" print "check for patches", From cd8e82ef4acd35604422ab3f415edf0871a9eb7d Mon Sep 17 00:00:00 2001 From: Anna Born Date: Thu, 8 Feb 2018 14:37:10 +0100 Subject: [PATCH 2/2] allows deep nesting in package name --- buildconf.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/buildconf.py b/buildconf.py index aa0df82..20cfe7e 100644 --- a/buildconf.py +++ b/buildconf.py @@ -83,7 +83,8 @@ def checkBaseName(package, info): if "$" in info["gitPackage"] and "*" not in package: info["basename"] = info["gitPackage"] info["gitPackage"] = info["gitPackage"].replace("$PACKAGE_BASENAME", - package.split("/")[-1]) + '-'.join((package.split("/")[1:]))) + def clonePackage(cfg, package, server, gitPackage, branch): clonePath = package