[gnome-continuous-yocto/gnomeostree-3.28-rocko: 2554/8267] bitbake: toaster: fix checking of repository url
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-continuous-yocto/gnomeostree-3.28-rocko: 2554/8267] bitbake: toaster: fix checking of repository url
- Date: Sat, 16 Dec 2017 23:23:36 +0000 (UTC)
commit 483c16a7ceac6deda2654772a2bf2aab79f94470
Author: Ed Bartosh <ed bartosh linux intel com>
Date: Fri Sep 16 17:22:28 2016 +0100
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>
.../toaster/bldcontrol/localhostbecontroller.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
index 39de6dd..a64e89b 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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]