@@ -1387,10 +1387,11 @@ class FetchData(object):
return
# Note: .done and .lock files should always be in DL_DIR whereas localpath may not be.
- if self.localpath and self.localpath.startswith(dldir):
- basepath = self.localpath
- elif self.localpath:
- basepath = dldir + os.sep + os.path.basename(self.localpath)
+ stamppath = self.method.stamppath(self, d) if self.localpath else None
+ if stamppath and stamppath.startswith(dldir):
+ basepath = stamppath
+ elif stamppath:
+ basepath = dldir + os.sep + os.path.basename(stamppath)
elif self.basepath or self.basename:
basepath = dldir + os.sep + (self.basepath or self.basename)
else:
@@ -1431,6 +1432,14 @@ class FetchMethod(object):
"""
return 0
+ def stamppath(self, urldata, d):
+ """
+ Return the path which the names of the .done and .lock files are based
+ on. This must not change between calls, as the lock is only effective
+ if every fetcher of the same url uses the same lock file.
+ """
+ return urldata.localpath
+
def localpath(self, urldata, d):
"""
Return the local filename of a given url assuming a successful fetch.
@@ -308,7 +308,16 @@ class Git(FetchMethod):
ud.fullshallow = os.path.join(dl_dir, ud.shallowtarball)
ud.mirrortarballs.insert(0, ud.shallowtarball)
+ def stamppath(self, ud, d):
+ # localpath() depends on whether the clone exists, the stamp and lock
+ # file names must not.
+ return ud.clonedir
+
def localpath(self, ud, d):
+ # When do_fetch used the shallow tarball without creating the clone,
+ # the tarball is the result of the fetch.
+ if ud.shallow and not os.path.exists(ud.clonedir) and os.path.exists(ud.fullshallow):
+ return ud.fullshallow
return ud.clonedir
def need_update(self, ud, d):
@@ -805,8 +814,9 @@ class Git(FetchMethod):
to_remove = [ud.localpath, ud.fullmirror, ud.fullmirror + ".done"]
# The localpath is a symlink to clonedir when it is cloned from a
- # mirror, so remove both of them.
- if os.path.islink(ud.localpath):
+ # mirror, so remove both of them. When it is the shallow tarball, it
+ # can be a symlink to the tarball in the mirror, which must be kept.
+ if not (ud.shallow and ud.localpath == ud.fullshallow) and os.path.islink(ud.localpath):
clonedir = os.path.realpath(ud.localpath)
to_remove.append(clonedir)
@@ -2335,6 +2335,72 @@ class GitShallowTest(FetcherTest):
self.fetch_and_unpack()
self.assertRevCount(1)
+ def test_shallow_mirrors_localpath(self):
+ self.add_empty_file('a')
+ self.add_empty_file('b')
+
+ # Fetch once to generate the shallow tarball
+ fetcher, ud = self.fetch()
+ mirrortarball = ud.mirrortarballs[0]
+
+ # Set up the mirror
+ mirrordir = os.path.join(self.tempdir, 'mirror')
+ bb.utils.mkdirhier(mirrordir)
+ self.d.setVar('PREMIRRORS', 'git://.*/.* file://%s/' % mirrordir)
+
+ bb.utils.rename(os.path.join(self.dldir, mirrortarball),
+ os.path.join(mirrordir, mirrortarball))
+
+ # Fetch from the mirror, which does not create a clone
+ bb.utils.remove(self.dldir, recurse=True)
+ bb.utils.remove(self.gitdir, recurse=True)
+ fetcher, ud = self.fetch()
+ self.assertFalse(os.path.exists(ud.clonedir))
+
+ # A new fetcher must find the result of the previous fetch
+ url = self.d.getVar('SRC_URI').split()[0]
+ fetcher = bb.fetch.Fetch([url], self.d)
+ self.assertTrue(os.path.exists(fetcher.localpath(url)))
+
+ # The lock and done stamp must not depend on whether the clone exists,
+ # or fetchers would not exclude each other.
+ self.assertEqual(fetcher.ud[url].lockfile, ud.lockfile)
+ self.assertEqual(fetcher.ud[url].donestamp, ud.donestamp)
+ self.assertEqual(fetcher.ud[url].lockfile, ud.clonedir + '.lock')
+
+ def test_clean(self):
+ self.add_empty_file('a')
+
+ # Cleaning must work with and without shallow tarballs
+ for shallow in ('0', '1'):
+ self.d.setVar('BB_GIT_SHALLOW', shallow)
+ fetcher, ud = self.fetch()
+ fetcher.clean()
+ self.assertFalse(os.path.exists(ud.clonedir))
+ self.assertFalse(os.path.exists(os.path.join(self.dldir, ud.mirrortarballs[0])))
+
+ def test_shallow_mirrors_clean_keeps_mirror(self):
+ self.add_empty_file('a')
+ self.add_empty_file('b')
+
+ fetcher, ud = self.fetch()
+ mirrortarball = ud.mirrortarballs[0]
+ mirrordir = os.path.join(self.tempdir, 'mirror')
+ bb.utils.mkdirhier(mirrordir)
+ self.d.setVar('PREMIRRORS', 'git://.*/.* file://%s/' % mirrordir)
+ bb.utils.rename(os.path.join(self.dldir, mirrortarball),
+ os.path.join(mirrordir, mirrortarball))
+
+ # Fetch from the mirror, which links to the tarball in the mirror
+ bb.utils.remove(self.dldir, recurse=True)
+ bb.utils.remove(self.gitdir, recurse=True)
+ fetcher, ud = self.fetch()
+ fetcher = bb.fetch.Fetch([self.d.getVar('SRC_URI').split()[0]], self.d)
+ fetcher.clean()
+
+ # Cleaning DL_DIR must not remove the tarball in the mirror
+ self.assertTrue(os.path.exists(os.path.join(mirrordir, mirrortarball)))
+
@skipIfNoNetwork()
def test_shallow_mirrors_with_multiple_same_urls(self):
url = "git://git.openembedded.org/bitbake;branch=master;protocol=https;rev=82ea737a0b42a8b53e11c9cde141e9e9c0bd8c40"