summaryrefslogtreecommitdiffstats
path: root/scripts/lib
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2020-12-28 21:04:15 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-12-31 11:53:26 +0000
commitf1efa4792f26130f9a11ead62507e57d60ff9f4d (patch)
treedb1bc0d58f20b64cd781960fed9b34f74bdaeb8d /scripts/lib
parente4b1b01f5a79b38ebcc5356f08ebec2f79b1fe85 (diff)
downloadpoky-f1efa4792f26130f9a11ead62507e57d60ff9f4d.tar.gz
devtool: gitsm:// should be handled same as git:// in upgrades
(From OE-Core rev: e7076f1742bb83e76aa4e90aad861546536166cf) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib')
-rw-r--r--scripts/lib/devtool/upgrade.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/lib/devtool/upgrade.py b/scripts/lib/devtool/upgrade.py
index 0c1de8cdc7..5a057e95f5 100644
--- a/scripts/lib/devtool/upgrade.py
+++ b/scripts/lib/devtool/upgrade.py
@@ -178,7 +178,7 @@ def _extract_new_source(newpv, srctree, no_patch, srcrev, srcbranch, branch, kee
178 uri, rev = _get_uri(crd) 178 uri, rev = _get_uri(crd)
179 if srcrev: 179 if srcrev:
180 rev = srcrev 180 rev = srcrev
181 if uri.startswith('git://'): 181 if uri.startswith('git://') or uri.startswith('gitsm://'):
182 __run('git fetch') 182 __run('git fetch')
183 __run('git checkout %s' % rev) 183 __run('git checkout %s' % rev)
184 __run('git tag -f devtool-base-new') 184 __run('git tag -f devtool-base-new')
@@ -270,7 +270,7 @@ def _extract_new_source(newpv, srctree, no_patch, srcrev, srcbranch, branch, kee
270 else: 270 else:
271 logger.warning('Command \'%s\' failed:\n%s' % (e.command, e.stdout)) 271 logger.warning('Command \'%s\' failed:\n%s' % (e.command, e.stdout))
272 if not skiptag: 272 if not skiptag:
273 if uri.startswith('git://'): 273 if uri.startswith('git://') or uri.startswith('gitsm://'):
274 suffix = 'new' 274 suffix = 'new'
275 else: 275 else:
276 suffix = newpv 276 suffix = newpv