Introduce gbp-pq-rpm tool

Initial version of gbp-pq-rpm: a tool for managing patch queues for rpm
packages.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Signed-off-by: Olev Kartau <olev.kartau@intel.com>
Conflicts:
	gbp/config.py
	gbp/scripts/pq_rpm.py
	tests/01_test_help.py

diff --git a/gbp/config.py b/gbp/config.py
index cf25de8..225ae65 100644 (file)
--- a/gbp/config.py
+++ b/gbp/config.py
@@ -593,7 +593,6 @@ class GbpOptionParserRpm(GbpOptionParser):
     Handles commandline options and parsing of config files for rpm tools
     """
     defaults = dict(GbpOptionParser.defaults)
-<<<<<<< HEAD
     defaults.update( {
                        'vendor'                 : 'vendor',
                        'native'                 : 'auto',

diff --git a/gbp/scripts/pq_rpm.py b/gbp/scripts/pq_rpm.py
index 6380ee2..ac0d4f4 100755 (executable)
--- a/gbp/scripts/pq_rpm.py
+++ b/gbp/scripts/pq_rpm.py
@@ -608,10 +608,6 @@ def main(argv):
     try:
         parser = GbpOptionParserRpm(command=os.path.basename(argv[0]),
                                     prefix='', usage=USAGE_STRING)
-    except ConfigParser.ParsingError as err:
-        gbp.log.err('Invalid config file: %s' % err)
-        return 1
-
     parser.add_boolean_config_file_option(option_name="patch-numbers",
             dest="patch_numbers")
     parser.add_option("-v", "--verbose", action="store_true", dest="verbose",