diff options
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 |