From 745a0eca470a22efa96ed2cf762daa583cb172ed Mon Sep 17 00:00:00 2001
From: Jun Wang <junbill.wang@samsung.com>
Date: Thu, 28 Jan 2016 04:32:24 +0800
Subject: [PATCH] Fix some errors of merging

Change-Id: I4441fb369aa88598f238c41710edeba01cd537b6
---
 .gitignore                 | 8 ++++----
 .gitmodules                | 3 +++
 debian/control             | 3 ---
 gbp/scripts/common/pq.py   | 6 ------
 gbp/scripts/import_srpm.py | 2 --
 gbp/scripts/pq_rpm.py      | 3 ---
 6 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/.gitignore b/.gitignore
index 80960ac..afc87ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,10 +18,10 @@ docs/manpage.links
 docs/manpage.refs
 docs/version.ent
 
-debian/git-buildpackage*.debhelper*
+debian/git-buildpackage.*.debhelper
+debian/git-buildpackage.debhelper.*
 debian/python-module-stampdir/
 debian/files
-debian/git-buildpackage*.substvars
+debian/git-buildpackage.substvars
 debian/git-buildpackage/
-debian/git-buildpackage-rpm/
-debian/tmp/
+
diff --git a/.gitmodules b/.gitmodules
index 29b4c39..6e17739 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "tests/component/deb/data"]
 	path = tests/component/deb/data
 	url = ssh://fushuai1985@review.tizen.org:29418/tools/git-buildpackage-deb-testdata
+[submodule "tests/component/rpm/data"]
+	path = tests/component/rpm/data
+	url = ssh://fushuai1985@review.tizen.org:29418/tools/git-buildpackage-rpm-testdata
diff --git a/debian/control b/debian/control
index 6598780..705fd7c 100644
--- a/debian/control
+++ b/debian/control
@@ -12,12 +12,9 @@ Build-Depends:
  pychecker,
  python (>> 2.6.6-3~),
  python-epydoc,
- python-mock,
  python-nose,
  python-pkg-resources,
- python-rpm,
  python-setuptools,
- rpm,
  sgml2x,
 # For rpm (epydoc)
  python-rpm
diff --git a/gbp/scripts/common/pq.py b/gbp/scripts/common/pq.py
index 1686884..a91ec8e 100644
--- a/gbp/scripts/common/pq.py
+++ b/gbp/scripts/common/pq.py
@@ -88,10 +88,6 @@ def is_pq_branch(branch, options):
         return True
     return False
 
-    pq_re = re.compile(r'^%s$' % (pq_format_str % dict(branch="(?P<base>\S+)")))
-    if pq_re.match(branch):
-        return True
-    return False
 
 def pq_branch_name(branch, options, extra_keys=None):
     """
@@ -120,8 +116,6 @@ def pq_branch_name(branch, options, extra_keys=None):
     if not is_pq_branch(branch, options):
         return pq_format_str % format_fields
 
-    if not is_pq_branch(branch, options):
-        return pq_format_str % format_fields
 
 def pq_branch_base(pq_branch, options):
     """
diff --git a/gbp/scripts/import_srpm.py b/gbp/scripts/import_srpm.py
index 7a397fe..85f1225 100755
--- a/gbp/scripts/import_srpm.py
+++ b/gbp/scripts/import_srpm.py
@@ -197,8 +197,6 @@ def parse_args(argv):
     parser.add_config_file_option(option_name="color-scheme",
                                   dest="color_scheme")
     parser.add_config_file_option(option_name="tmp-dir", dest="tmp_dir")
-    parser.add_config_file_option(option_name="vendor", action="store",
-                    dest="vendor")
     parser.add_option("--download", action="store_true", dest="download",
                       default=False, help="download source package")
     parser.add_config_file_option(option_name="vendor", action="store",
diff --git a/gbp/scripts/pq_rpm.py b/gbp/scripts/pq_rpm.py
index 2f4f42c..c33e67b 100755
--- a/gbp/scripts/pq_rpm.py
+++ b/gbp/scripts/pq_rpm.py
@@ -690,9 +690,6 @@ def main(argv):
             dest="patch_export_squash_until")
     parser.add_config_file_option("patch-export-ignore-path",
             dest="patch_export_ignore_path")
-    parser.add_option("--export-rev", action="store", dest="export_rev", default="",
-                      help="Export patches from treeish object TREEISH instead "
-                           "of head of patch-queue branch", metavar="TREEISH")
 
     (options, args) = parser.parse_args(argv)
     gbp.log.setup(options.color, options.verbose, options.color_scheme)
-- 
2.7.4