]> code.ossystems Code Review - openembedded-core.git/commitdiff
devtool: upgrade: fetch remote repository before checking out new revision
authorPaul Eggleton <paul.eggleton@linux.intel.com>
Sun, 22 Nov 2015 21:07:57 +0000 (10:07 +1300)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 1 Dec 2015 21:30:54 +0000 (21:30 +0000)
If we're upgrading a recipe that fetches from git, and we've simply
fetched a tarball of the repo instead of directly from the upstream repo
(this can happen if you have PREMIRRORS set up as in poky with a core recipe,
e.g. kernelshark) then we won't have any new revisions, and the checkout
will fail with "fatal: reference is not a tree: <hash>". To avoid this,
do a "git fetch" before checking out the new revision.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
scripts/lib/devtool/upgrade.py

index 8851a6edbed91850c3aa11efd6ecfd2aab79c6af..13e309632501ac1beb1c40d64c3f7122c688c86f 100644 (file)
@@ -199,6 +199,7 @@ def _extract_new_source(newpv, srctree, no_patch, srcrev, branch, keep_temp, tin
     if srcrev:
         rev = srcrev
     if uri.startswith('git://'):
+        __run('git fetch')
         __run('git checkout %s' % rev)
         __run('git tag -f devtool-base-new')
         md5 = None