summaryrefslogtreecommitdiffstats
path: root/scripts/lib/devtool/sdk.py
diff options
context:
space:
mode:
authorStephano Cetola <stephano.cetola@linux.intel.com>2016-04-15 09:40:29 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-04-18 16:28:22 +0100
commitdee47ad159512e377ff588153e39b555b9ce599b (patch)
tree9452a80654669e4e90bda39060f5e5870d6b3fd2 /scripts/lib/devtool/sdk.py
parent396e64d58e5f84bd30cedc5552b3c9ed61aa4840 (diff)
downloadpoky-dee47ad159512e377ff588153e39b555b9ce599b.tar.gz
devtool: sdk-update: reset git metadata on update
Replace git pull with fetch and reset to avoid the merge logic in the event that the layers repo in the published SDK we're updating to isn't fast-forward merge from the local repo. Also add gitignore and committer info during publish to avoid errors and to be sure that the first commit has a dummy user in it. [ YOCTO #9368 ] (From OE-Core rev: 4657bc9d165e51981e034e73e7b92552e873eef7) Signed-off-by: Stephano Cetola <stephano.cetola@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/devtool/sdk.py')
-rw-r--r--scripts/lib/devtool/sdk.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/scripts/lib/devtool/sdk.py b/scripts/lib/devtool/sdk.py
index b1905f9863..a22841d789 100644
--- a/scripts/lib/devtool/sdk.py
+++ b/scripts/lib/devtool/sdk.py
@@ -186,9 +186,15 @@ def sdk_update(args, config, basepath, workspace):
186 return 0 186 return 0
187 # Update metadata 187 # Update metadata
188 logger.debug("Updating metadata via git ...") 188 logger.debug("Updating metadata via git ...")
189 # Try using 'git pull', if failed, use 'git clone' 189 #Check for the status before doing a fetch and reset
190 if os.path.exists(os.path.join(basepath, 'layers/.git')): 190 if os.path.exists(os.path.join(basepath, 'layers/.git')):
191 ret = subprocess.call("git pull %s/layers/.git" % updateserver, shell=True, cwd=layers_dir) 191 out = subprocess.check_output("git status --porcelain", shell=True, cwd=layers_dir)
192 if not out:
193 ret = subprocess.call("git fetch --all; git reset --hard", shell=True, cwd=layers_dir)
194 else:
195 logger.error("Failed to update metadata as there have been changes made to it. Aborting.");
196 logger.error("Changed files:\n%s" % out);
197 return -1
192 else: 198 else:
193 ret = -1 199 ret = -1
194 if ret != 0: 200 if ret != 0: