diff options
| author |   Urs Fässler <urs.fassler@bbv.ch> | 2018-10-03 12:04:06 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-10-04 14:33:53 +0100 |
| commit | b7f00a8c11672a2ee0408e210fb174cda3384e3f (patch) | |
| tree | 11a8f40c424add8e8e93601e901a6954e91696d1 | |
| parent | 9038e029f4f0ab413727de76c74248cbb3cdc9ea (diff) | |
| download | bitbake-b7f00a8c11672a2ee0408e210fb174cda3384e3f.tar.gz | |
fetch2/git: prevent access to non-existing fullshallow tarball
Signed-off-by: Urs Fässler <urs.fassler@bbv.ch>
Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | lib/bb/fetch2/git.py | 2 | ||||
| -rw-r--r-- | lib/bb/tests/fetch.py | 14 |
2 files changed, 15 insertions, 1 deletions
diff --git a/lib/bb/fetch2/git.py b/lib/bb/fetch2/git.py index e46ea4893..63c433a4a 100644 --- a/lib/bb/fetch2/git.py +++ b/lib/bb/fetch2/git.py @@ -476,7 +476,7 @@ class Git(FetchMethod): if os.path.exists(destdir): bb.utils.prunedir(destdir) - if ud.shallow and self.need_update(ud, d): + if ud.shallow and os.path.exists(ud.fullshallow) and self.need_update(ud, d): bb.utils.mkdirhier(destdir) runfetchcmd("tar -xzf %s" % ud.fullshallow, d, workdir=destdir) else: diff --git a/lib/bb/tests/fetch.py b/lib/bb/tests/fetch.py index 2c314f46d..ff66315aa 100644 --- a/lib/bb/tests/fetch.py +++ b/lib/bb/tests/fetch.py @@ -1580,3 +1580,17 @@ class GitShallowTest(FetcherTest): self.assertNotEqual(orig_revs, revs) self.assertRefs(['master', 'origin/master']) self.assertRevCount(orig_revs - 1758) + + @skipIfNoNetwork() + def test_that_unpack_does_work_when_using_git_shallow_tarball_but_tarball_is_not_available(self): + self.d.setVar('SRCREV', 'e5939ff608b95cdd4d0ab0e1935781ab9a276ac0') + self.d.setVar('BB_GIT_SHALLOW', '1') + self.d.setVar('BB_GENERATE_SHALLOW_TARBALLS', '1') + fetcher = bb.fetch.Fetch(["git://git.yoctoproject.org/fstests"], self.d) + fetcher.download() + + bb.utils.remove(self.dldir + "/*.tar.gz") + fetcher.unpack(self.unpackdir) + + dir = os.listdir(self.unpackdir + "/git/") + self.assertIn("fstests.doap", dir) |