diff options
author | Tim Beale <timbeale@catalyst.net.nz> | 2019-02-13 12:41:34 +1300 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2019-02-15 04:35:22 +0100 |
commit | 6ba99c367275764f336dc3201c38ba907818d838 (patch) | |
tree | 29ea07d606e282acc94690f4a0040d0f389531e2 /script/autobuild.py | |
parent | 5f3beb6e4109ce0d1a648e80dbf3024040d3c54e (diff) | |
download | samba-6ba99c367275764f336dc3201c38ba907818d838.tar.gz |
autobuild: Update variable name to make more sense
When we switched from python2 being the default to python3, we didn't
update this variable name. It's now handling the python2 case, but it's
a boolean flag named 'py3', which is rather confusing.
Signed-off-by: Tim Beale <timbeale@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'script/autobuild.py')
-rwxr-xr-x | script/autobuild.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/script/autobuild.py b/script/autobuild.py index 30bc64306ff..72050e0eb02 100755 --- a/script/autobuild.py +++ b/script/autobuild.py @@ -457,9 +457,9 @@ def run_cmd(cmd, dir=".", show=None, output=False, checkfail=True): class builder(object): '''handle build of one directory''' - def __init__(self, name, sequence, cp=True, py3=False): + def __init__(self, name, sequence, cp=True, py2=False): self.name = name - self.py3 = py3 + self.py2 = py2 if name in builddirs: self.dir = builddirs[name] else: @@ -498,7 +498,7 @@ class builder(object): (self.stage, self.cmd, self.output_mime_type) = self.sequence[self.next] self.cmd = self.cmd.replace("${PYTHON_PREFIX}", get_python_lib(plat_specific=1, standard_lib=0, prefix=self.prefix)) self.cmd = self.cmd.replace("${PREFIX}", "--prefix=%s" % self.prefix) - if self.py3: + if self.py2: self.cmd = self.cmd.replace("${EXTRA_PYTHON}", "%s" % extra_python) # The trailing space is important self.cmd = self.cmd.replace("${PY3_ONLY}", "python2 ") @@ -542,7 +542,7 @@ class buildlist(object): b = builder(n, tasks[n[:-4]], cp=n is not "pidl", - py3=True) + py2=True) else: b = builder(n, tasks[n], cp=n is not "pidl") self.tlist.append(b) |