]> code.ossystems Code Review - openembedded-core.git/commitdiff
devtool: sdk-update: fix metadata update step
authorPaul Eggleton <paul.eggleton@linux.intel.com>
Wed, 6 Jan 2016 11:15:46 +0000 (00:15 +1300)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 11 Jan 2016 15:41:06 +0000 (15:41 +0000)
* Clone the correct path - we need .git on the end
* Pull from the specified path instead of expecting a remote to be set
* up in the repo already (it isn't by default)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
scripts/lib/devtool/sdk.py

index afe52cf1b625072b1a566e381b0200131fbc0de2..daa3e4ecaeb7dd4298e5d7004da16bffad62e2e3 100644 (file)
@@ -156,11 +156,11 @@ def sdk_update(args, config, basepath, workspace):
         logger.debug("Updating meta data via git ...")
         # Try using 'git pull', if failed, use 'git clone'
         if os.path.exists(os.path.join(basepath, 'layers/.git')):
-            ret = subprocess.call("cd layers && git pull", shell=True)
+            ret = subprocess.call("cd layers && git pull %s/layers/.git" % updateserver, shell=True)
         else:
             ret = -1
         if ret != 0:
-            ret = subprocess.call("rm -rf layers && git clone %s/layers" % updateserver, shell=True)
+            ret = subprocess.call("rm -rf layers && git clone %s/layers/.git" % updateserver, shell=True)
         if ret != 0:
             logger.error("Updating meta data via git failed")
             return ret