From 0b632e34bc1865637b21a2b8d059dbf4c8724e99 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Thibaut=20VAR=C3=88NE?= Date: Fri, 21 Oct 2022 11:16:42 +0200 Subject: [PATCH] phase1: refactor populateTargets() MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Thibaut VARÈNE --- phase1/master.cfg | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/phase1/master.cfg b/phase1/master.cfg index be53f60..1d31b78 100644 --- a/phase1/master.cfg +++ b/phase1/master.cfg @@ -235,14 +235,15 @@ c['prioritizeBuilders'] = prioritizeBuilders targets = [ ] def populateTargets(): - if not os.path.isdir(work_dir+'/source.git'): - subprocess.call(["git", "clone", "--depth=1", "--branch="+repo_branch, repo_url, work_dir+'/source.git']) - else: - subprocess.call(["git", "pull"], cwd = work_dir+'/source.git') + sourcegit = work_dir + '/source.git' + if os.path.isdir(sourcegit): + subprocess.call(["rm", "-rf", sourcegit]) + + subprocess.call(["git", "clone", "--depth=1", "--branch="+repo_branch, repo_url, sourcegit]) - os.makedirs(work_dir+'/source.git/tmp', exist_ok=True) + os.makedirs(sourcegit + '/tmp', exist_ok=True) findtargets = subprocess.Popen(['./scripts/dump-target-info.pl', 'targets'], - stdout = subprocess.PIPE, stderr = subprocess.DEVNULL, cwd = work_dir+'/source.git') + stdout = subprocess.PIPE, stderr = subprocess.DEVNULL, cwd = sourcegit) while True: line = findtargets.stdout.readline() @@ -251,6 +252,8 @@ def populateTargets(): ta = line.decode().strip().split(' ') targets.append(ta[0]) + subprocess.call(["rm", "-rf", sourcegit]) + populateTargets() # the 'change_source' setting tells the buildmaster how it should find out -- 2.30.2