Refactored reading local .gbs.conf

If gbs is called as an API local .gbs.conf is not read if it's not in
the current directory. This change fixes this.

Change-Id: I642591bea4f2dd958cd13d11b365b6f4ef00e6c4
Signed-off-by: Ed Bartosh <eduard.bartosh@intel.com>

diff --git a/gitbuildsys/cmd_build.py b/gitbuildsys/cmd_build.py
index 606c282799b724e1ab34a5381bcc6e3fd3191e79..d6bd6de134f2e265370cbe79d73e2b91f47ceef4 100644 (file)
--- a/gitbuildsys/cmd_build.py
+++ b/gitbuildsys/cmd_build.py
@@ -25,7 +25,7 @@ import pwd
 import re
 import urlparse
 
-from gitbuildsys.utils import Temp, RepoParser
+from gitbuildsys.utils import Temp, RepoParser, read_localconf
 from gitbuildsys.errors import GbsError, Usage
 from gitbuildsys.conf import configmgr
 from gitbuildsys.safe_url import SafeURL
@@ -241,6 +241,8 @@ def main(args):
             raise GbsError("git project can't be found for --spec, "
                            "give it in argument or cd into it")
 
+    read_localconf(workdir)
+
     hostarch = os.uname()[4]
     if args.arch:
         buildarch = args.arch

diff --git a/gitbuildsys/cmd_export.py b/gitbuildsys/cmd_export.py
index c3836c6afa90bed1ad628b4084b8bfede96bb111..b88990ba79f51b671a74d884e6647c7ec419f7ad 100644 (file)
--- a/gitbuildsys/cmd_export.py
+++ b/gitbuildsys/cmd_export.py
@@ -219,6 +219,7 @@ def main(args):
     except GitRepositoryError, err:
         raise GbsError(str(err))
 
+    utils.read_localconf(repo.path)
     utils.git_status_checker(repo, args)
     workdir = repo.path
 

diff --git a/gitbuildsys/cmd_remotebuild.py b/gitbuildsys/cmd_remotebuild.py
index 8821cda82356f509834be11d9c39cd576d22f0b2..d21d41476f82c3c3da8a16c5d2efd3429f1b4ccf 100644 (file)
--- a/gitbuildsys/cmd_remotebuild.py
+++ b/gitbuildsys/cmd_remotebuild.py
@@ -81,6 +81,8 @@ def main(args):
 
     workdir = repo.path
 
+    utils.read_localconf(workdir)
+
     if not (args.buildlog or args.status):
         utils.git_status_checker(repo, args)
 

diff --git a/gitbuildsys/utils.py b/gitbuildsys/utils.py
index 94c84f3e022a0ee20269887c0cbd2d4d710e6500..e85af253a94904ed989c4db723817ede526e543e 100644 (file)
--- a/gitbuildsys/utils.py
+++ b/gitbuildsys/utils.py
@@ -490,14 +490,21 @@ class RepoParser(object):
 
         return filter_valid_repo(repos)
 
+
+def read_localconf(workdir):
+    """Read local configuration file from project directory."""
+    from gitbuildsys.conf import configmgr
+    prj_conf = os.path.join(workdir, '.gbs.conf')
+    if os.path.exists(prj_conf) and workdir != os.getcwd():
+        configmgr.add_conf(prj_conf)
+
+
 class SearchConfAction(argparse.Action):
     """
     Action for gitdir position argument to find project special
     gbs.conf
     """
     def __call__(self, parser, namespace, value, option_string=None):
-        from gitbuildsys.conf import configmgr
-
         workdir = value
         try:
             repo = RpmGitRepository(value)
@@ -505,9 +512,7 @@ class SearchConfAction(argparse.Action):
         except GitRepositoryError, err:
             pass
 
-        prj_conf = os.path.join(workdir, '.gbs.conf')
-        if os.path.exists(prj_conf) and workdir != os.getcwd():
-            configmgr.add_conf(prj_conf)
+        read_localconf(workdir)
         setattr(namespace, self.dest, value)
 
 def git_status_checker(git, opts):