[oe-commits] [bitbake] 07/16: toaster: fix checking of repository url

[git at git.openembedded.org]

rpurdie pushed a commit to branch master-next
in repository bitbake.

commit 7e9a89e3fde5e71cb859799635974ec41790c44d
Author: Ed Bartosh <ed.bartosh at linux.intel.com>
AuthorDate: Fri Sep 16 17:22:28 2016 +0100

    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]
    
    Signed-off-by: Ed Bartosh <ed.bartosh at linux.intel.com>
    Signed-off-by: Michael Wood <michael.g.wood at intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 lib/toaster/bldcontrol/localhostbecontroller.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/toaster/bldcontrol/localhostbecontroller.py b/lib/toaster/bldcontrol/localhostbecontroller.py
index 39de6dd..a64e89b 100644
--- a/lib/toaster/bldcontrol/localhostbecontroller.py
+++ b/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

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.