phase1: move target enumeration to function

Signed-off-by: Thibaut VARÈNE <hacks@slashdirt.org>

diff --git a/phase1/master.cfg b/phase1/master.cfg
index 9c88dafd570be8c2627bc36cd7f5c40ef77d6eb6..be53f60078ad8d0f324c87e262e8b4739ae18b91 100644 (file)
--- 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.