diff options
Diffstat (limited to 'scripts/lib')
-rw-r--r-- | scripts/lib/devtool/sdk.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/lib/devtool/sdk.py b/scripts/lib/devtool/sdk.py index e8bf0ad98c..f46577c2ab 100644 --- a/scripts/lib/devtool/sdk.py +++ b/scripts/lib/devtool/sdk.py | |||
@@ -155,7 +155,7 @@ def sdk_update(args, config, basepath, workspace): | |||
155 | if os.path.exists(os.path.join(basepath, 'layers/.git')): | 155 | if os.path.exists(os.path.join(basepath, 'layers/.git')): |
156 | out = subprocess.check_output("git status --porcelain", shell=True, cwd=layers_dir) | 156 | out = subprocess.check_output("git status --porcelain", shell=True, cwd=layers_dir) |
157 | if not out: | 157 | if not out: |
158 | ret = subprocess.call("git fetch --all; git reset --hard", shell=True, cwd=layers_dir) | 158 | ret = subprocess.call("git fetch --all; git reset --hard @{u}", shell=True, cwd=layers_dir) |
159 | else: | 159 | else: |
160 | logger.error("Failed to update metadata as there have been changes made to it. Aborting."); | 160 | logger.error("Failed to update metadata as there have been changes made to it. Aborting."); |
161 | logger.error("Changed files:\n%s" % out); | 161 | logger.error("Changed files:\n%s" % out); |