Make CoprClient import optional.

Also, fix one last reference to the old rida module name that I noticed while I was in there.
This commit is contained in:
Ralph Bean
2016-10-24 21:27:18 -04:00
parent 17fb31d2fd
commit 77befa7dad
2 changed files with 15 additions and 5 deletions

View File

@@ -46,15 +46,18 @@ import kobo.rpmlib
import munch
from OpenSSL.SSL import SysCallError
from copr.client import CoprClient
from module_build_service import log, db
from module_build_service.models import ModuleBuild
import module_build_service.utils
logging.basicConfig(level=logging.DEBUG)
try:
from copr.client import CoprClient
except ImportError:
log.exception("Failed to import CoprClient.")
# TODO: read defaults from module_build_service's config
KOJI_DEFAULT_GROUPS = {
'build': [

View File

@@ -27,12 +27,19 @@
import modulemd
from pdc_client import PDCClient
from copr.client import CoprClient
import logging
log = logging.getLogger()
try:
from copr.client import CoprClient
except ImportError:
log.exception("Failed to import CoprClient.")
import six
import module_build_service
def get_pdc_client_session(config):
"""
:param config: instance of module_build_service.config.Config
@@ -161,7 +168,7 @@ def get_module_repo(session, module_info, strict=False, config=module_build_serv
:param module_info: list of module_info dicts
:param strict: Normally this function returns None if no module can be
found. If strict=True, then a ValueError is raised.
:param config: instance of rida.config.Config
:param config: instance of module_build_service.config.Config
:return: URL to a DNF repository for the module
"""
module = get_module(session, module_info, strict=strict)