From b43fca3bc801015b5790dbd8871e406d9dc23243 Mon Sep 17 00:00:00 2001 From: Chenxiong Qi Date: May 25 2017 00:34:30 +0000 Subject: Merge #220 `Make osbs optional` --- diff --git a/pyrpkg/__init__.py b/pyrpkg/__init__.py index 66dd7e2..3a1d544 100644 --- a/pyrpkg/__init__.py +++ b/pyrpkg/__init__.py @@ -27,8 +27,6 @@ import sys import tempfile import koji.ssl.SSLCommon -from osbs.api import OSBS -from osbs.conf import Configuration from six.moves import configparser from six.moves import urllib @@ -2488,6 +2486,15 @@ class Commands(object): def osbs_build(self, config_file, config_section, target_override=False, yum_repourls=[], nowait=False): + # Because docker image should be built via Koji not in OSBS directly, + # it is not necessary to make osbs as a hard dependency + try: + from osbs.api import OSBS + from osbs.conf import Configuration + except ImportError: + raise rpkgError('Before building docker image in OSBS directly, ' + 'please install python-osbs-client in advance.') + self.check_repo() os_conf = Configuration(conf_file=config_file, conf_section=config_section) build_conf = Configuration(conf_file=config_file, conf_section=config_section)