diff options
Diffstat (limited to 'bitbake/lib/toaster/bldcontrol/localhostbecontroller.py')
| -rw-r--r-- | bitbake/lib/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 4814b84afd..6bd019ae30 100644 --- a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py +++ b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py | |||
| @@ -252,7 +252,7 @@ class LocalhostBEController(BuildEnvironmentController): | |||
| 252 | # branch magic name "HEAD" will inhibit checkout | 252 | # branch magic name "HEAD" will inhibit checkout |
| 253 | if commit != "HEAD": | 253 | if commit != "HEAD": |
| 254 | logger.debug("localhostbecontroller: checking out commit %s to %s " % (commit, localdirname)) | 254 | logger.debug("localhostbecontroller: checking out commit %s to %s " % (commit, localdirname)) |
| 255 | self._shellcmd("git fetch --all && git checkout \"%s\" && git pull --rebase" % (commit) , localdirname) | 255 | self._shellcmd("git fetch --all && git checkout \"%s\" && git rebase \"origin/%s\"" % (commit, commit) , localdirname) |
| 256 | 256 | ||
| 257 | # take the localdirname as poky dir if we can find the oe-init-build-env | 257 | # take the localdirname as poky dir if we can find the oe-init-build-env |
| 258 | if self.pokydirname is None and os.path.exists(os.path.join(localdirname, "oe-init-build-env")): | 258 | if self.pokydirname is None and os.path.exists(os.path.join(localdirname, "oe-init-build-env")): |
