cmd_build: Improved using of repositories. Fixes #33

Used both types of repos - mentioned in config file and specified in
commandline. Previously only one type is used.

Implemented --skip-conf-repos command line option to allow skipping
repos, mentioned in config file.

Change-Id: If55fdff2a4f74fde0ed0b14b441ac87e348ff3ff

diff --git a/gitbuildsys/cmd_build.py b/gitbuildsys/cmd_build.py
index 4c015ae..72850ce 100644 (file)
--- a/gitbuildsys/cmd_build.py
+++ b/gitbuildsys/cmd_build.py
@@ -317,12 +317,14 @@ def do(opts, args):
             os.makedirs(cachedir)
         msger.info('generate repositories ...')
 
-        repos_urls_conf = get_repos_conf()
-        if opts.repositories:
-            repos = opts.repositories
-        elif repos_urls_conf:
-            repos = repos_urls_conf
+        if opts.skip_conf_repos:
+            repos = []
         else:
+            repos = get_repos_conf()
+
+        if opts.repositories:
+            repos.extend(opts.repositories)
+        if not repos:
             msger.error('No package repository specified.')
 
         repoparser = utils.RepoParser(repos, cachedir)

diff --git a/tools/gbs b/tools/gbs
index 6b2918f..f272ee5 100755 (executable)
--- a/tools/gbs
+++ b/tools/gbs
@@ -193,6 +193,11 @@ class Gbs(cmdln.Cmdln):
                   help='Do incremental build, which needs support of spec file,'
                        ' and tar ball unpack stage should be enabled with the '
                        'condition of RPM macro RSYNCDONE')
+    @cmdln.option('--skip-conf-repos',
+                  action="store_true",
+                  default=False,
+                  dest='skip_conf_repos',
+                  help='Skip repositories mentioned in config file')
     @cmdln.option('-c', '--commit',
                   default=None,
                   dest='commit',