Update gbs build and build service code.

gbs build can pack package, create project/package directory.

oscpkg.commit() has some issue need to be fixed.

diff --git a/gitbuildsys/buildservice.py b/gitbuildsys/buildservice.py
index ccd1e9a..83ef8ae 100644 (file)
--- a/gitbuildsys/buildservice.py
+++ b/gitbuildsys/buildservice.py
@@ -1054,17 +1054,20 @@ class BuildService():
         """
 
         if core.is_package_dir(wd):
-            return core.findpacs([path])[0]
+            return core.findpacs([wd])[0]
         else:
             return None
 
     def mk_pac(self, pkg_path):
         """Create empty package for new one under CWD
         """
+        prj = pkg_path.split('/')[0]
+        pkg = pkg_path.split('/')[1]
+        core.make_dir(self.apiurl, prj, pkg, pathname = '.')
+        os.chdir(pkg_path)
+        core.init_package_dir(self.apiurl, prj, pkg, pkg, files=False)
 
-        core.createPackageDir(pkg_path)
-
-    def submit(self, wd='.'):
+    def submit(self, msg, wd='.'):
         if not core.is_package_dir(wd):
             # TODO show some error message
             return

diff --git a/gitbuildsys/cmd_build.py b/gitbuildsys/cmd_build.py
index e40d071..93d0e9d 100644 (file)
--- a/gitbuildsys/cmd_build.py
+++ b/gitbuildsys/cmd_build.py
@@ -30,8 +30,7 @@ import msger
 import runner
 from conf import configmgr
 import git
-import buildservice
-
+import obspkg
 OSCRC_TEMPLATE = """[general]
 apiurl = %(api)s
 [%(apiurl)s]
@@ -80,12 +79,11 @@ def do(opts, args):
     ret, out = runner.runtool(['grep', '^Version', specfile])
     version = out.split()[-1]
 
-    bs = buildservice.BuildService(apiurl = SRCSERVER, oscrc = oscrcpath)
-
-    #obspkg = ObsPackage(tmpdir, SRCSERVER, "home:%s:branches:gbs:Trunk" % USER, name, oscrcpath)
-    #workdir = obspkg.get_workdir()
-    workdir = os.getcwd()
-    #obspkg.remove_all()
+    localpkg = obspkg.ObsPackage(tmpdir, "home:%s:branches:gbs:Trunk" % USER, name, SRCSERVER, oscrcpath)
+    workdir = localpkg.get_workdir()
+    import pdb
+    pdb.set_trace()
+    localpkg.remove_all()
 
     srcdir = "%s-%s" % (name, version)
     os.mkdir(srcdir)
@@ -105,6 +103,6 @@ def do(opts, args):
     for f in glob.glob('packaging/*'):
         shutil.copy(f, workdir)
 
-    #obspkg.add_all()
-    #obspkg.commit ()
+    localpkg.update_local()
+    localpkg.commit ("Submit packaging files to obs for test work")
     os.unlink(oscrcpath)

diff --git a/gitbuildsys/obspkg.py b/gitbuildsys/obspkg.py
index 7eb3bb2..2970b53 100644 (file)
--- a/gitbuildsys/obspkg.py
+++ b/gitbuildsys/obspkg.py
@@ -19,6 +19,7 @@
 from __future__ import with_statement
 import os
 import buildservice
+import runner
 
 class _Workdir(object):
     def __init__(self, path):
@@ -54,7 +55,7 @@ class ObsPackage(object):
         self._bs = buildservice.BuildService(apiurl, oscrc)
         self._apiurl = self._bs.apiurl
 
-        self._bdir = os.path.absdir(os.path.expanduser(basedir))
+        self._bdir = os.path.abspath(os.path.expanduser(basedir))
         self._prj = prj
         self._pkg = pkg
         self._pkgpath = os.path.join(self._bdir, prj, pkg)
@@ -96,7 +97,8 @@ class ObsPackage(object):
         """
         with _Workdir(self._pkgpath):
             pac = self._bs.find_pac()
-            pac.todo = list(set(pac.filenamelist + pac.filenamelist_unvers + pac.to_be_added))
+            # FIXME, if pac.to_be_added are needed to be considered.
+            pac.todo = list(set(pac.filenamelist + pac.filenamelist_unvers))
             for filename in pac.todo:
                 if os.path.isdir(filename):
                     continue
@@ -123,4 +125,4 @@ class ObsPackage(object):
 
     def commit(self, msg):
         with _Workdir(self._pkgpath):
-            self._bs.submit()
+            self._bs.submit(msg)