From 6ec4465f7a14c202576c52318dadb45f01977479 Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Thu, 19 Apr 2012 05:46:59 +0300 Subject: [PATCH] Used git-buildpackage in gbs build mode Change-Id: I79e0be3209c007f3d161fbe64968ba257c3089de --- gitbuildsys/cmd_build.py | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/gitbuildsys/cmd_build.py b/gitbuildsys/cmd_build.py index 007788b..94494cf 100644 --- a/gitbuildsys/cmd_build.py +++ b/gitbuildsys/cmd_build.py @@ -34,6 +34,8 @@ import git import obspkg import errors +from gbp.scripts.buildpackage_rpm import main as gbp_build + OSCRC_TEMPLATE = """[general] apiurl = %(apiurl)s plaintext_passwd=0 @@ -116,16 +118,11 @@ def do(opts, args): oscworkdir = localpkg.get_workdir() localpkg.remove_all() - source = utils.parse_spec(specfile, 'SOURCE0') - urlres = urlparse.urlparse(source) - - tarball = '%s/%s' % (oscworkdir, os.path.basename(urlres.path)) - msger.info('archive git tree to tarball: %s' % os.path.basename(tarball)) - mygit = git.Git(workdir) - mygit.archive("%s-%s/" % (name, version), tarball) - - for f in glob.glob('%s/packaging/*' % workdir): - shutil.copy(f, oscworkdir) + if gbp_build(["argv[0] placeholder", "--git-export-only", + "--git-ignore-new", "--git-builder=osc", + "--git-export-dir=%s" % oscworkdir, + "--git-packaging-dir=packaging"]): + msger.error("Failed to get packaging info from git tree") localpkg.update_local() -- 2.7.4