summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
diff options
context:
space:
mode:
authorAlexandru DAMIAN <alexandru.damian@intel.com>2015-02-13 10:22:35 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-02-17 14:38:31 +0000
commit377526562d07bcaea42e2c53c8508e5416b35419 (patch)
tree8fa1d261569965ce51c73601f26dbe42d1f37a76 /bitbake/lib/toaster/bldcontrol/localhostbecontroller.py
parenta07cf2e50c376ce1fdcc9ac77e291595489de3ce (diff)
downloadpoky-377526562d07bcaea42e2c53c8508e5416b35419.tar.gz
bitbake: toaster: fix git checkout command
This patch fixes the git checkout command that would fail to properly rebase the working tree in some cases. [YOCTO #7309] (Bitbake rev: 25640851c8f8459741d2c423b2bb54f9f59a536a) Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster/bldcontrol/localhostbecontroller.py')
-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 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")):