From c6b23f5277974bf8efa2e25069f5b225bf0058c8 Mon Sep 17 00:00:00 2001 From: Aurélien Bompard Date: Mar 25 2021 21:52:15 +0000 Subject: More FASJSON support Signed-off-by: Aurélien Bompard --- diff --git a/toddlers/plugins/check_email_overrides.py b/toddlers/plugins/check_email_overrides.py index 24b17c4..9abf894 100644 --- a/toddlers/plugins/check_email_overrides.py +++ b/toddlers/plugins/check_email_overrides.py @@ -68,7 +68,10 @@ class CheckEmailOverrides(ToddlerBase): data = toml.loads(req.text) _log.info("Setting up connection to FAS") - fedora_account.set_fas(config) + if config.get("fasjson"): + fedora_account.set_fasjson(config) + else: + fedora_account.set_fas(config) _log.info("Setting up connection to bugzilla") bugzilla_system.set_bz(config) diff --git a/toddlers/plugins/packager_bugzilla_sync.py b/toddlers/plugins/packager_bugzilla_sync.py index f89560d..1ac4672 100644 --- a/toddlers/plugins/packager_bugzilla_sync.py +++ b/toddlers/plugins/packager_bugzilla_sync.py @@ -56,7 +56,10 @@ class PackagerBugzillaSync(ToddlerBase): raise _log.info("Setting up connection to FAS") - fedora_account.set_fas(config) + if config.get("fasjson"): + fedora_account.set_fasjson(config) + else: + fedora_account.set_fas(config) if not username: # Retrieve all the packagers in FAS: diff --git a/toddlers/plugins/packagers_without_bugzilla.py b/toddlers/plugins/packagers_without_bugzilla.py index d0fcd54..76bcec4 100644 --- a/toddlers/plugins/packagers_without_bugzilla.py +++ b/toddlers/plugins/packagers_without_bugzilla.py @@ -100,7 +100,10 @@ class PackagersWithoutBugzilla(ToddlerBase): raise _log.info("Setting up connection to FAS") - fedora_account.set_fas(config) + if config.get("fasjson"): + fedora_account.set_fasjson(config) + else: + fedora_account.set_fas(config) if not username: # Retrieve all the packagers and groups in dist-git