Add --packaging-branch for gbs clone sub-command

set main devel branch use --packaging-branch, and the default is master.

Change-Id: Ic79a85a3b6403d49259143349a1ccc84ce57bb51

diff --git a/gitbuildsys/cmd_clone.py b/gitbuildsys/cmd_clone.py
index 1a4d3276d29ae1afc8e4b89214267d91239ca4b8..25124c8637860ea1124b8bdfec519f5cf7a2af5a 100644 (file)
--- a/gitbuildsys/cmd_clone.py
+++ b/gitbuildsys/cmd_clone.py
@@ -40,13 +40,16 @@ def main(args):
         upstream_branch = args.upstream_branch
     else:
         upstream_branch = configmgr.get('upstream_branch', 'general')
-
+    if args.packaging_branch:
+        packaging_branch = args.packaging_branch
+    else:
+        packaging_branch = configmgr.get('packaging_branch', 'general')
     # Construct GBP cmdline arguments
     gbp_args = ['dummy argv[0]',
                 '--color-scheme=magenta:green:yellow:red',
                 '--pristine-tar',
                 '--upstream-branch=%s' % upstream_branch,
-                '--packaging-branch=master']
+                '--packaging-branch=%s' % packaging_branch]
     if args.all:
         gbp_args.append('--all')
     if args.depth:

diff --git a/gitbuildsys/conf.py b/gitbuildsys/conf.py
index cf5edcf71f7cd89daaecc9084d8c59ab6e0a5192..8f58fc955511061b5e70c2037deb37bea14b17e3 100644 (file)
--- a/gitbuildsys/conf.py
+++ b/gitbuildsys/conf.py
@@ -173,6 +173,7 @@ class ConfigMgr(object):
             'general': {
                 'tmpdir': '/var/tmp',
                 'editor': '',
+                'packaging_branch': 'master',
                 'upstream_branch': 'upstream',
                 'upstream_tag': 'upstream/${upstreamversion}',
                 'squash_patches_until': '',

diff --git a/tools/gbs b/tools/gbs
index 7a296958684664869215b39cc53c64db494ecb82..333b138ca5cfd3f612a9a5899d03d73ce75930f0 100755 (executable)
--- a/tools/gbs
+++ b/tools/gbs
@@ -429,6 +429,7 @@ def clone_parser(parser):
 
     parser.add_argument('uri', help='path/uri to a git repository')
     parser.add_argument('--upstream-branch', help='upstream branch')
+    parser.add_argument('--packaging-branch', help='packaging branch, or development branch')
     parser.add_argument('--all', action='store_true',
                         help='track all remote branches')
     parser.add_argument('--depth',