diff options
author | David Reyna <David.Reyna@windriver.com> | 2018-10-01 00:45:57 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-10-04 23:00:24 +0100 |
commit | f0cf4b0972173d5463a31a2543098cee7d6e11c3 (patch) | |
tree | f3fc789ce2c19e6d7341cb4219dbc00c733e4602 /bitbake/lib/toaster/bldcontrol | |
parent | e7b4ae9d7245596a0c18908791a1293fb8678ab2 (diff) | |
download | poky-f0cf4b0972173d5463a31a2543098cee7d6e11c3.tar.gz |
bitbake: toaster: disable git remote check to allow for firewalls
Toaster users behind firewalls that block "git" access usually
require developers to add remap rules in their "~/.gitconfig"
to remap GIT accesses to HTTP* access. However, there is a
"git remote" test in Toaster that is not aware of such remaps,
resulting in a false error.
For now, disable this nice-to-have check to support this release,
and re-enable when we can add remapping accommodations for this
test.
[YOCTO #12944]
(Bitbake rev: abccd40536b366a418802c5ba8427454c2e3bb2c)
Signed-off-by: David Reyna <David.Reyna@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster/bldcontrol')
-rw-r--r-- | bitbake/lib/toaster/bldcontrol/localhostbecontroller.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py index 67bfbf6394..9490635934 100644 --- a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py +++ b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py | |||
@@ -177,8 +177,11 @@ class LocalhostBEController(BuildEnvironmentController): | |||
177 | try: | 177 | try: |
178 | localremotes = self._shellcmd("git remote -v", | 178 | localremotes = self._shellcmd("git remote -v", |
179 | localdirname,env=git_env) | 179 | localdirname,env=git_env) |
180 | if not giturl in localremotes and commit != 'HEAD': | 180 | # NOTE: this nice-to-have check breaks when using git remaping to get past firewall |
181 | raise BuildSetupException("Existing git repository at %s, but with different remotes ('%s', expected '%s'). Toaster will not continue out of fear of damaging something." % (localdirname, ", ".join(localremotes.split("\n")), giturl)) | 181 | # Re-enable later with .gitconfig remapping checks |
182 | #if not giturl in localremotes and commit != 'HEAD': | ||
183 | # raise BuildSetupException("Existing git repository at %s, but with different remotes ('%s', expected '%s'). Toaster will not continue out of fear of damaging something." % (localdirname, ", ".join(localremotes.split("\n")), giturl)) | ||
184 | pass | ||
182 | except ShellCmdException: | 185 | except ShellCmdException: |
183 | # our localdirname might not be a git repository | 186 | # our localdirname might not be a git repository |
184 | #- that's fine | 187 | #- that's fine |