summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>2016-05-13 16:34:04 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-08-25 23:03:46 +0100
commit7fcc9f5ead9d82067b27facf1b47a490b93489c7 (patch)
tree58fbc4afcd297ab38cb1600ed64d6d91ea65c80b
parent665800fdf645cfc4757be9137a7b6800bc8f4767 (diff)
downloadopenembedded-core-contrib-7fcc9f5ead9d82067b27facf1b47a490b93489c7.tar.gz
openembedded-core-contrib-7fcc9f5ead9d82067b27facf1b47a490b93489c7.tar.bz2
openembedded-core-contrib-7fcc9f5ead9d82067b27facf1b47a490b93489c7.zip
oeqa.utils.git: support git commands with updated env
Extend GitRepo.run_cmd so that the caller may redefine and/or define additional environment variables that will be used when the git command is run. (From OE-Core rev: 9b3c7c47f5d0fa473fe1db81b59b26531414781c) Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oeqa/utils/git.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/meta/lib/oeqa/utils/git.py b/meta/lib/oeqa/utils/git.py
index a4c6741f4e..6a2987fbe8 100644
--- a/meta/lib/oeqa/utils/git.py
+++ b/meta/lib/oeqa/utils/git.py
@@ -30,9 +30,13 @@ class GitRepo(object):
cmd_str, ret.status, ret.output))
return ret.output.strip()
- def run_cmd(self, git_args):
+ def run_cmd(self, git_args, env_update=None):
"""Run Git command"""
- return self._run_git_cmd_at(git_args, self.top_dir)
+ env = None
+ if env_update:
+ env = os.environ.copy()
+ env.update(env_update)
+ return self._run_git_cmd_at(git_args, self.top_dir, env=env)