From f6a0ab148da863347236496d2ef080c28c9c327c Mon Sep 17 00:00:00 2001 From: Lin Yang Date: Fri, 25 Oct 2013 12:12:55 +0800 Subject: [PATCH] Fix import gbp.rpm.parse_spec failure In gbp new version, it change parse_spec() function name to SpecFile(). Fixes: #1419 Change-Id: I74bb5971080038e89a573dd5b86cc2567600de9f Signed-off-by: Lin Yang --- job_policycheck.py | 4 ++-- job_submitobs.py | 4 ++-- packaging/jenkins-scripts.spec | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/job_policycheck.py b/job_policycheck.py index c5fdfae..7efee89 100755 --- a/job_policycheck.py +++ b/job_policycheck.py @@ -17,7 +17,7 @@ from common import gerrit from common import mapping from common.tempbuildpkg import TempPackageBuild -from gbp.rpm import parse_spec +from gbp.rpm import SpecFile def end(tmpdir, return_code = 0): """Get return code""" @@ -73,7 +73,7 @@ def build_package(obs_dest_prj, specfile, prjdir, packagingdir, events, obs_dest_prj, build_num) try: - spec = parse_spec(specfile) + spec = SpecFile(specfile) # submit this change to OBS for build check print 'submit this change to OBS for build check...' diff --git a/job_submitobs.py b/job_submitobs.py index c8c1fd2..de66953 100755 --- a/job_submitobs.py +++ b/job_submitobs.py @@ -22,7 +22,7 @@ from common.gerrit import Gerrit, get_gerrit_event from common.send_mail import prepare_mail from common.buildservice import BuildService -from gbp.rpm import parse_spec +from gbp.rpm import SpecFile from gbp.git.repository import GitRepositoryError from gbp.errors import GbpError @@ -236,7 +236,7 @@ def parse_specfile(specfile, tmp_dir, prj_dir, packaging_dir, tag, event, \ try: # use gbp to parse specfile - spec = parse_spec(specfile) + spec = SpecFile(specfile) except GbpError, err: print('gbp parse spec failed. %s' % err) msg = 'The tag %s pushed, but backend service failed to parse %s. '\ diff --git a/packaging/jenkins-scripts.spec b/packaging/jenkins-scripts.spec index f2c9d2c..745cbe3 100644 --- a/packaging/jenkins-scripts.spec +++ b/packaging/jenkins-scripts.spec @@ -30,7 +30,7 @@ Summary: Common API for all instances Group: Development/Tools/Building Requires: createrepo Requires: git-core -Requires: git-buildpackage-common +Requires: tizen-gbp-rpm >= 20131017 Requires: python-cheetah Requires: python-redis Requires: python-yaml -- 2.7.4