robojerk/tumbi-assembler
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove remaining mentions of runroot option

Browse source 
This also cleans up the runroot method detection code to not rely on the
now removed option.

JIRA: COMPOSE-2634
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This commit is contained in:
Lubomír Sedlář 2019-07-02 09:39:00 +02:00
parent 49d0ab797c
commit bf1b3e8421
8 changed files with 14 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

22
pungi/runroot.py
View file

@ -37,20 +37,20 @@ class Runroot(kobo.log.LoggingBase):
def get_runroot_method(self):
"""
Returns the runroot method by checking the `runroot` and
Returns the runroot method by checking the `runroot_tag` and
`runroot_method` options in configuration.
:return: The "local" or "koji" string.
:return: The configured method
"""
runroot = self.compose.conf.get("runroot", None)
runroot_method = self.compose.conf.get("runroot_method", None)
if runroot is None and runroot_method is None:
raise ValueError("No runroot_method set.")
if runroot is False:
runroot_method = "local"
elif runroot and not runroot_method:
runroot_method = "koji"
return runroot_method
runroot_tag = self.compose.conf.get("runroot_tag")
runroot_method = self.compose.conf.get("runroot_method")
if runroot_tag and not runroot_method:
# If we have runroot tag and no method, let's assume koji method
# for backwards compatibility.
return "koji"
# Otherwise use the configured method or default to local if nothing is
# given.
return runroot_method or "local"
def _run_local(self, command, log_file=None, **kwargs):
"""