From: Zhang Qiang <qiang.z.zhang@intel.com>
Date: Thu, 9 Feb 2012 08:57:23 +0000 (+0800)
Subject: gbs-build: enhancement and bug fix
X-Git-Tag: v0.2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=32b622ca1844a211deebc07dfe3a323d1683f05e;p=tools%2Fgbs.git

gbs-build: enhancement and bug fix

* dont use keyring
* re-define tar ball format
* give details obs package url
---

diff --git a/gitbuildsys/cmd_build.py b/gitbuildsys/cmd_build.py
index 47a7460..e09b403 100644
--- a/gitbuildsys/cmd_build.py
+++ b/gitbuildsys/cmd_build.py
@@ -36,6 +36,8 @@ import obspkg
 OSCRC_TEMPLATE = """[general]
 apiurl = %(apiurl)s
 plaintext_passwd=0
+use_keyring=0
+gnome_keyring=0
 [%(apiurl)s]
 user=%(user)s
 passx=%(passwdx)s
@@ -82,6 +84,8 @@ def do(opts, args):
     # get 'name' and 'version' from spec file
     name = utils.parse_spec(specfile, 'name')
     version = utils.parse_spec(specfile, 'version')
+    if not name or not version:
+        msger.error('can\'t get correct name or version from spec file.')
 
     if opts.base_obsprj is None:
         # TODO, get current branch of git to determine it
@@ -108,7 +112,7 @@ def do(opts, args):
     srcdir = "%s-%s" % (name, version)
     os.mkdir(srcdir)
 
-    tarball = '%s-%s.tizen.tar.bz2' % (name, version)
+    tarball = '%s-%s-tizen.tar.bz2' % (name, version)
     msger.info('archive git tree to tar ball: %s' % tarball)
     tarfp = '%s/%s' % (workdir, tarball)
     tar = tarfile.open(tarfp, 'w:bz2')
@@ -134,5 +138,5 @@ def do(opts, args):
     os.unlink(oscrcpath)
     msger.info('local changes submitted to build server successfully')
     msger.info('follow the link to monitor the build progress:\n'
-               '  %s/project/show?project=%s' \
-               % (APISERVER.replace('api', 'build'), target_prj))
+               '  %s/package/show?package=%s&project=%s' \
+               % (APISERVER.replace('api', 'build'), name, target_prj))