Used --upstream_branch option in import mode

Change-Id: Ia8986aeb2d991e894eea2f7af03ac17d9343b425

diff --git a/gitbuildsys/cmd_import.py b/gitbuildsys/cmd_import.py
index 02c132e..685ebbd 100644 (file)
--- a/gitbuildsys/cmd_import.py
+++ b/gitbuildsys/cmd_import.py
@@ -37,20 +37,20 @@ def do(opts, args):
     if len(args) > 1:
         msger.error('too many arguments! Please reference gbs import --help.')
 
+    params = ["argv[0] placeholder", "--packaging-dir=packaging",
+              "--upstream-branch=%s" % opts.upstream_branch, args[0]]
+
     if args[0].endswith('.src.rpm'):
-        if gbp_import_srpm(["argv[0] placeholder",
-                            "--packaging-dir=packaging", args[0]]):
+        if gbp_import_srpm(params):
             msger.error("Failed to import %s" % args[0])
     elif args[0].endswith('.spec'):
-        if gbp_import_srpm(["argv[0] placeholder", "--unpacked",
-                            "--packaging-dir=packaging", args[0]]):
+        params.insert(1, "--unpacked")
+        if gbp_import_srpm(params):
             msger.error("Failed to import %s" % args[0])
     else:
-        params = ['argv[0] placeholder', args[0]]
         if opts.no_merge:
-            params.append('--no-merge')
+            params.insert(1, '--no-merge')
         if gbp_import_orig(params):
             msger.error('Failed to import %s' % args[0])
 
     msger.info('done.')
-

diff --git a/tools/gbs b/tools/gbs
index 3c3d33f..8da435b 100755 (executable)
--- a/tools/gbs
+++ b/tools/gbs
@@ -191,7 +191,7 @@ class Gbs(cmdln.Cmdln):
                   dest='tag',
                   help='Create tag while import new upstream tar ball')
     @cmdln.option('--upstream_branch',
-                  default=None,
+                  default='upstream',
                   dest='upstream_branch',
                   help='specify upstream branch for new version of package')
     @cmdln.option('--no-merge',