From 6ef3265d2b0f8bc55c5d3fffa253e961ab31b041 Mon Sep 17 00:00:00 2001
From: Brad Bishop <bradleyb@fuzziesquirrel.com>
Date: Tue, 9 Oct 2018 18:59:25 +0100
Subject: poky: sumo refresh 3b8dc3a88e..36d5cee56b
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Update poky to sumo HEAD.

Andreas Müller (1):
      libsdl2: Fix left rotated display for RaspPi/VC4/GLES2

Anuj Mittal (2):
      qemux86-directdisk: remove mem= parameter
      initramfs-framework/udev: call settle before kill

Armin Kuster (1):
      libcroco: CVE-2017-7961

Awais Belal (1):
      bitbake: toaster: Fix bitbake flexible path error from Bugzilla #12891

Chong Yi Chai (1):
      mkefidisk: fix installation of kernel image

Paulo Neves (1):
      bitbake: fetcher: Fixed remote removal not throwing exception.

Richard Purdie (1):
      bitbake: main: Fix environment handling for UI module imports

Ross Burton (2):
      security_flags: disable static PIE in glibc
      cmake: put cmake.m4 and toolchain file in PN

Sinan Kaya (1):
      gnupg: CVE-2018-9234

Change-Id: Ia9ff256122334cf5f1fb8d377ac3f295605ac68b
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
---
 poky/bitbake/lib/bb/fetch2/git.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'poky/bitbake/lib/bb/fetch2')

diff --git a/poky/bitbake/lib/bb/fetch2/git.py b/poky/bitbake/lib/bb/fetch2/git.py
index 3de83bed1..7b618c6fb 100644
--- a/poky/bitbake/lib/bb/fetch2/git.py
+++ b/poky/bitbake/lib/bb/fetch2/git.py
@@ -354,10 +354,9 @@ class Git(FetchMethod):
             if not self._contains_ref(ud, d, name, ud.clonedir):
                 needupdate = True
         if needupdate:
-            try: 
-                runfetchcmd("%s remote rm origin" % ud.basecmd, d, workdir=ud.clonedir)
-            except bb.fetch2.FetchError:
-                logger.debug(1, "No Origin")
+            output = runfetchcmd("%s remote" % ud.basecmd, d, quiet=True, workdir=ud.clonedir)
+            if "origin" in output:
+              runfetchcmd("%s remote rm origin" % ud.basecmd, d, workdir=ud.clonedir)
 
             runfetchcmd("%s remote add --mirror=fetch origin %s" % (ud.basecmd, repourl), d, workdir=ud.clonedir)
             fetch_cmd = "LANG=C %s fetch -f --prune --progress %s refs/*:refs/*" % (ud.basecmd, repourl)
-- 
cgit v1.2.3