summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2016-09-14 13:53:54 +0300
committerEd Bartosh <ed.bartosh@linux.intel.com>2016-09-14 13:53:54 +0300
commite15489589a6ba655efed8df546db851dc4ba6c05 (patch)
treeb57615893e6e174d98e99d99614fdd5fd6d21c3e
parent75927f8f6809b9b4696fc438b240bc7a3db561e2 (diff)
downloadpoky-contrib-ed/toaster/mixed-http-git-repos-10163.tar.gz
poky-contrib-ed/toaster/mixed-http-git-repos-10163.tar.bz2
poky-contrib-ed/toaster/mixed-http-git-repos-10163.zip
toaster: fix checking of repository urled/toaster/mixed-http-git-repos-10163
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] Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
-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 39de6dd94e0..a64e89b93b8 100644
--- a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
+++ b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
@@ -156,7 +156,7 @@ class LocalhostBEController(BuildEnvironmentController):
try:
localremotes = self._shellcmd("git remote -v",
localdirname)
- if not giturl in localremotes:
+ if not giturl in localremotes and commit != 'HEAD':
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))
except ShellCmdException:
# our localdirname might not be a git repository