summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2016-09-16 17:22:28 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-21 21:58:06 +0100
commit483c16a7ceac6deda2654772a2bf2aab79f94470 (patch)
tree2140dcf6eea3214f4882cc499a5bac579b1c6459
parent08af663a15d5ddfabe8eeb07e52f69c48fd46baf (diff)
downloadpoky-483c16a7ceac6deda2654772a2bf2aab79f94470.tar.gz
bitbake: toaster: fix checking of repository url
Toaster checks gir repository url is the same as locally cloned before checking it out to existing local clone. This check can be skipped if commit is 'HEAD' as in this case repository is not hard reset to commit, so the local clone won't be changed. [YOCTO #10163] (Bitbake rev: 7e9a89e3fde5e71cb859799635974ec41790c44d) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Michael Wood <michael.g.wood@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/toaster/bldcontrol/localhostbecontroller.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
index 39de6dd94e..a64e89b93b 100644
--- a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
+++ b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
@@ -156,7 +156,7 @@ class LocalhostBEController(BuildEnvironmentController):
156 try: 156 try:
157 localremotes = self._shellcmd("git remote -v", 157 localremotes = self._shellcmd("git remote -v",
158 localdirname) 158 localdirname)
159 if not giturl in localremotes: 159 if not giturl in localremotes and commit != 'HEAD':
160 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)) 160 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))
161 except ShellCmdException: 161 except ShellCmdException:
162 # our localdirname might not be a git repository 162 # our localdirname might not be a git repository