diff --git a/rida/builder.py b/rida/builder.py index 55dfb663..049f5dd3 100644 --- a/rida/builder.py +++ b/rida/builder.py @@ -257,7 +257,7 @@ class KojiModuleBuilder(GenericBuilder): log.debug("Using koji profile %r" % config.koji_profile) log.debug("Using koji_config: %s" % config.koji_config) - self.koji_session, self.koji_module = self.get_session_from_config(config) + self.koji_session = self.get_session_from_config(config) self.arches = config.koji_arches if not self.arches: raise ValueError("No koji_arches specified in the config.") @@ -365,10 +365,6 @@ chmod 644 %buildroot/%_rpmconfigdir/macros.d/macros.modules profile_name=config.koji_profile, user_config=config.koji_config, )) - koji_module = koji.get_profile_module( - config.koji_profile, - config=koji_config, - ) address = koji_config.server log.info("Connecting to koji %r" % address) @@ -397,7 +393,8 @@ chmod 644 %buildroot/%_rpmconfigdir/macros.d/macros.modules ) else: raise ValueError("Unrecognized koji authtype %r" % authtype) - return (koji_session, koji_module) + + return koji_session def buildroot_connect(self): log.info("%r connecting buildroot." % self) diff --git a/rida/scheduler/main.py b/rida/scheduler/main.py index 47e6558e..cb34f425 100644 --- a/rida/scheduler/main.py +++ b/rida/scheduler/main.py @@ -185,7 +185,8 @@ class Poller(threading.Thread): # TODO re-use if conf.system == "koji": - koji_session, _ = rida.builder.KojiModuleBuilder.get_session_from_config(conf) + koji_session = ( + rida.builder.KojiModuleBuilder.get_session_from_config(conf)) log.info("Querying tasks for statuses:") res = models.ComponentBuild.query.filter_by(state=koji.BUILD_STATES['BUILDING']).all()