buildpackage_rpm: fix the export packaging files failed.

Fix the export path is invalid.
Fix the param of pq-branch function is wrong.
Conver the 'patch_export_compress' option to int.

Change-Id: Iae0cb0d4780de153655c52307c5fb25410802c11
Signed-off-by: wanchao-xu <wanchao.xu@samsung.com>

diff --git a/gbp/scripts/buildpackage_rpm.py b/gbp/scripts/buildpackage_rpm.py
index 4d9f9da031a37c5a5fcc62935f8b4c6d491b5734..03ddc97f8f98123cc5187b4d0f0d19068b6e6ad2 100644 (file)
--- a/gbp/scripts/buildpackage_rpm.py
+++ b/gbp/scripts/buildpackage_rpm.py
@@ -202,8 +202,8 @@ def guess_export_params(repo, options):
     elif options.export in repo.get_local_branches():
         branch = options.export
     if branch:
-        if is_pq_branch(branch, options):
-            packaging_branch = pq_branch_base(branch, options)
+        if is_pq_branch(branch, options.pq_branch):
+            packaging_branch = pq_branch_base(branch, options.pq_branch)
             if repo.has_branch(packaging_branch):
                 gbp.log.info("It seems you're building a development/patch-"
                              "queue branch. Export target changed to '%s' and "
@@ -219,7 +219,7 @@ def guess_export_params(repo, options):
         elif options.patch_export and not options.patch_export_rev:
             tree = get_tree(repo, options.export)
             spec = parse_spec(options, repo, treeish=tree)
-            pq_branch = pq_branch_name(branch, options, spec.version)
+            pq_branch = pq_branch_name(branch, options.pq_branch, spec.version)
             if repo.has_branch(pq_branch):
                 gbp.log.info("Exporting patches from development/patch-queue "
                              "branch '%s'" % pq_branch)
@@ -309,8 +309,8 @@ def setup_builder(options, builder_args):
             '--define', "_sourcedir %%_topdir/%s" % options.export_sourcedir])
     elif options.builder.startswith('osc'):
         builder_args.insert(0, 'build')
-        options.source_dir = ''
-        options.spec_dir = ''
+        options.export_sourcedir = ''
+        options.export_specdir = ''
 
 
 def packaging_tag_data(repo, commit, name, version, options):
@@ -391,6 +391,8 @@ def build_parser(name, prefix=None, git_treeish=None):
     parser.add_option("--git-verbose", action="store_true", dest="verbose",
                       default=False, help="verbose command execution")
     parser.add_config_file_option(option_name="tmp-dir", dest="tmp_dir")
+    parser.add_config_file_option(option_name="abbrev", dest="abbrev",
+                                  type="int")
     parser.add_config_file_option(option_name="color", dest="color",
                                   type='tristate')
     parser.add_config_file_option(option_name="color-scheme",
@@ -543,6 +545,7 @@ def parse_args(argv, prefix, git_treeish=None):
     if not parser:
         return None, None, None
     options, args = parser.parse_args(args)
+    options.patch_export_compress = rpm.string_to_int(options.patch_export_compress)
 
     gbp.log.setup(options.color, options.verbose, options.color_scheme)
     if not options.hooks:
@@ -641,17 +644,18 @@ def main(argv):
 
             # Move packaging files to final export dir
             gbp.log.debug("Exporting packaging files from '%s' to '%s'" %
-                          (dump_dir, export_dir))
-            for fname in os.listdir(dump_dir):
-                src = os.path.join(dump_dir, fname)
+                          (spec.specdir, export_dir))
+            for fname in os.listdir(spec.specdir):
+                src = os.path.join(spec.specdir, fname)
                 if fname == spec.specfile:
                     dst = os.path.join(spec_dir, fname)
                 else:
                     dst = os.path.join(source_dir, fname)
-                try:
-                    shutil.copy2(src, dst)
-                except IOError as err:
-                    raise GbpError("Error exporting files: %s" % err)
+                if not os.path.isdir(src):
+                    try:
+                        shutil.copy2(src, dst)
+                    except IOError as err:
+                        raise GbpError("Error exporting files: %s" % err)
             spec.specdir = os.path.abspath(spec_dir)
 
             # Get/build the orig tarball