From a99a4ef541af13f93eae4eeb0852f97537886c24 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Fri, 21 Sep 2018 10:29:51 +0200 Subject: osmo-depcheck: don't use /tmp, better git code * replace --gitdir with --workdir and give it a new folder structure: * git/$repo: downloaded source code * build/$repo: files created during the build process * install/: installation prefix * adjust the jenkins job to use --workdir * fetch --tags when source exists already * readable error message for failed git checkout Change-Id: I06589277b9d54a2af177451cfab2ca1a658b4058 Relates: OS#2642 --- scripts/osmo-depcheck/parse.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'scripts/osmo-depcheck/parse.py') diff --git a/scripts/osmo-depcheck/parse.py b/scripts/osmo-depcheck/parse.py index c6297d6..06f932e 100644 --- a/scripts/osmo-depcheck/parse.py +++ b/scripts/osmo-depcheck/parse.py @@ -84,16 +84,16 @@ def library_version(line_i, condition): operator + "'") -def configure_ac(gitdir, repo): +def configure_ac(workdir, repo): """ Parse the PKG_CHECK_MODULES statements of a configure.ac file. - :param gitdir: parent folder of all locally cloned git repositories + :param workdir: path to where all data (git, build, install) is stored :param repo: the repository to look at (e.g. "osmo-bts") :returns: a dictionary like the following: {"libosmocore": "0.11.0", "libosmo-abis": "0.5.0"} """ # Read configure.ac - path = gitdir + "/" + repo + "/configure.ac" + path = workdir + "/git/" + repo + "/configure.ac" with open(path) as handle: lines = handle.readlines() -- cgit v1.2.3