[Toaster] [PATCH] toaster: fix checking of repository url

Michael Wood michael.g.wood at intel.com
Fri Sep 16 09:24:47 PDT 2016


Thanks - send to bitbake-devel and applied to toaster-next

On 14/09/16 12:03, Ed Bartosh wrote:
> 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>
> ---
>   bitbake/lib/toaster/bldcontrol/localhostbecontroller.py | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> 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




More information about the toaster mailing list