config: add 'packaging-branch' for GbpOptionParser.

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

diff --git a/gbp/config.py b/gbp/config.py
index fc8c234e9b560047231833d7612b39e5cb8e6f87..a082bc646dcd8cbfa783151c5f9baec1ab5d717e 100644 (file)
--- a/gbp/config.py
+++ b/gbp/config.py
@@ -159,6 +159,7 @@ class GbpOptionParser(OptionParser):
                 'no-create-orig': 'False',
                 'notify': 'auto',
                 'overlay': 'False',
+                'packaging-branch': 'master',
                 'patch-num-format': '%04d-',
                 'patch-numbers': 'True',
                 'pbuilder': 'False',
@@ -211,6 +212,10 @@ class GbpOptionParser(OptionParser):
         'debian-branch':
             "Branch the Debian package is being developed on, "
             "default is '%(debian-branch)s'",
+        'packaging-branch':
+            "Branch the packaging is being maintained on, "
+            "rpm counterpart of the 'debian-branch' option, "
+            "default is '%(packaging-branch)s'",
         'upstream-branch':
             "Upstream branch, default is '%(upstream-branch)s'",
         'upstream-tree':
@@ -810,7 +815,6 @@ class GbpOptionParserRpm(GbpOptionParser):
     defaults.update({
         'tmp-dir': '/var/tmp/gbp/',
         'vendor': 'vendor',
-        'packaging-branch': 'master',
         'packaging-dir': '',
         'packaging-tag-msg': '%(pkg)s (vendor)s release %(version)s',
         'packaging-tag': '%(vendor)s/%(version)s',
@@ -851,10 +855,6 @@ class GbpOptionParserRpm(GbpOptionParser):
                 "created, default is '%(tmp-dir)s'",
             'vendor':
                 "Distribution vendor name, default is '%(vendor)s'",
-            'packaging-branch':
-                "Branch the packaging is being maintained on, rpm counterpart "
-                "of the 'debian-branch' option, default is "
-                "'%(packaging-branch)s'",
             'packaging-dir':
                 "Subdir for RPM packaging files, default is "
                 "'%(packaging-dir)s'",