From 7b729b5e2e8e42b60ea0cb2cce7c0126dc8c505d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Thibaut=20VAR=C3=88NE?= Date: Thu, 20 Oct 2022 19:41:57 +0200 Subject: [PATCH] phase1: move target enumeration to function MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Thibaut VARÈNE --- phase1/master.cfg | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/phase1/master.cfg b/phase1/master.cfg index 9c88daf..be53f60 100644 --- a/phase1/master.cfg +++ b/phase1/master.cfg @@ -234,22 +234,24 @@ c['prioritizeBuilders'] = prioritizeBuilders # find targets targets = [ ] -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') - -os.makedirs(work_dir+'/source.git/tmp', exist_ok=True) -findtargets = subprocess.Popen(['./scripts/dump-target-info.pl', 'targets'], - stdout = subprocess.PIPE, cwd = work_dir+'/source.git') - -while True: - line = findtargets.stdout.readline() - if not line: - break - ta = line.decode().strip().split(' ') - targets.append(ta[0]) +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') + + os.makedirs(work_dir+'/source.git/tmp', exist_ok=True) + findtargets = subprocess.Popen(['./scripts/dump-target-info.pl', 'targets'], + stdout = subprocess.PIPE, stderr = subprocess.DEVNULL, cwd = work_dir+'/source.git') + + while True: + line = findtargets.stdout.readline() + if not line: + break + ta = line.decode().strip().split(' ') + targets.append(ta[0]) +populateTargets() # the 'change_source' setting tells the buildmaster how it should find out # about source code changes. Here we point to the buildbot clone of pyflakes. -- 2.30.2