From: Markus Lehtonen Date: Thu, 5 Dec 2013 07:25:49 +0000 (+0200) Subject: Run GBP in a separate thread X-Git-Tag: submit/devel/20190730.075437~68 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5ba4b284b3bdfdd41fba7616e6021c0f5f85b80f;p=services%2Fobs-service-git-buildpackage.git Run GBP in a separate thread Change-Id: I26e2d194fd3243b703ff741f3d0a12c6a5770cba Signed-off-by: Markus Lehtonen --- diff --git a/obs_service_gbp/command.py b/obs_service_gbp/command.py index 00ce33a..98378eb 100644 --- a/obs_service_gbp/command.py +++ b/obs_service_gbp/command.py @@ -27,6 +27,7 @@ from gbp.scripts.buildpackage import main as gbp_deb from gbp.scripts.buildpackage_rpm import main as gbp_rpm from obs_service_gbp import LOGGER, gbplog +from obs_service_gbp_utils import GbpServiceError, fork_call from gbp_repocache import CachedRepo, CachedRepoError import gbp_repocache @@ -146,7 +147,7 @@ def main(argv=None): if args.rpm == 'yes' or (args.rpm == 'auto' and specs_found): LOGGER.info('Exporting RPM packaging files with GBP') LOGGER.debug('git-buildpackage-rpm args: %s' % ' '.join(rpm_args)) - ret = gbp_rpm(rpm_args) + ret = fork_call(None, None, gbp_rpm, rpm_args) if ret: LOGGER.error('Git-buildpackage-rpm failed, unable to export ' 'RPM packaging files') @@ -154,11 +155,15 @@ def main(argv=None): if args.deb == 'yes' or (args.deb== 'auto' and os.path.isdir('debian')): LOGGER.info('Exporting Debian source package with GBP') LOGGER.debug('git-buildpackage args: %s' % ' '.join(deb_args)) - ret = gbp_deb(deb_args) + ret = fork_call(None, None, gbp_deb, deb_args) if ret: LOGGER.error('Git-buildpackage failed, unable to export Debian ' 'sources package files') return 3 + except GbpServiceError as err: + LOGGER.error('Internal service error when trying to run GBP: %s' % err) + LOGGER.error('This is most likely a configuration error (or a BUG)!') + return 1 finally: os.chdir(orig_dir)