Don't need check the existance of orig_file
authorZhang Qiang <qiang.z.zhang@intel.com>
Mon, 9 Jul 2012 06:33:30 +0000 (14:33 +0800)
committerZhang Qiang <qiang.z.zhang@intel.com>
Mon, 9 Jul 2012 06:33:30 +0000 (14:33 +0800)
use gbp_build to generate tar ball and export packaging files
directly, so we dont need care about the existance of orig_file (SOURCE)

without this patch, gbs build would fails if no SOURCE tag in specfile.

gitbuildsys/cmd_build.py

index dfbee7a3d1a1c0282f01a98ab5f6ec27ae5ac1d3..3118145f17bd5b0d4f2e1400f76b1bb71f65f996 100644 (file)
@@ -389,21 +389,20 @@ def do(opts, args):
 
     packaging_dir = os.path.join(workdir, 'packaging/')
     export_dir = tempfile.mkdtemp(prefix=packaging_dir + 'build_')
-    if spec.orig_file:
-        with utils.Workdir(workdir):
-            relative_spec = specfile.replace('%s/' % workdir, '')
-            commit = opts.commit or 'HEAD'
-            msger.info('export tar ball and packaging files ... ')
-            try:
-                if gbp_build(["argv[0] placeholder", "--git-export-only",
-                              "--git-ignore-new", "--git-builder=osc",
-                              "--git-export-dir=%s" % export_dir,
-                              "--git-packaging-dir=packaging",
-                              "--git-specfile=%s" % relative_spec,
-                              "--git-export=%s" % commit]):
-                    msger.error("Failed to get packaging info from git tree")
-            except GitRepositoryError, excobj:
-                msger.error("Repository error: %s" % excobj)
+    with utils.Workdir(workdir):
+        relative_spec = specfile.replace('%s/' % workdir, '')
+        commit = opts.commit or 'HEAD'
+        msger.info('export tar ball and packaging files ... ')
+        try:
+            if gbp_build(["argv[0] placeholder", "--git-export-only",
+                          "--git-ignore-new", "--git-builder=osc",
+                          "--git-export-dir=%s" % export_dir,
+                          "--git-packaging-dir=packaging",
+                          "--git-specfile=%s" % relative_spec,
+                          "--git-export=%s" % commit]):
+                msger.error("Failed to get packaging info from git tree")
+        except GitRepositoryError, excobj:
+            msger.error("Repository error: %s" % excobj)
 
     if opts.incremental:
         cmd += ['--rsync-src=%s' % os.path.abspath(workdir)]