fetch2: kill parameters in uri_find_decoded
PATCH 1/2 fetch2: kill parameters in uri_find_decoded
Fixes:
File "/bitbake/./lib/bb/fetch2/__init__.py", line 446, in uri_replace
if uri_decoded[loc][k] != uri_find_decoded[loc][k]:
KeyError: 'module'
--- bitbake/lib/bb/fetch2/__init__.py | 1 + 1 file changed, 1 insertion(+)
bitbake/lib/bb/fetch2/__init__.py +1 -0
@@ -469,6 +469,7 @@ def uri_replace(ud, uri_find, uri_replace, replacements, d, mirrortarball=None): basename = os.path.basename(mirrortarball) # Kill parameters, they make no sense for mirror tarballs uri_decoded[5] = {} + uri_find_decoded[5] = {} elif ud.localpath and ud.method.supports_checksum(ud): basename = os.path.basename(ud.localpath) if basename:
Signature · 1 line
2.39.0
PATCH 2/2 fetch2/tests: Add test for Mercurial
Basic test for mercurial functionality including PREMIRRORONLY with disabled network
--- bitbake/lib/bb/tests/fetch.py | 44 +++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+)
bitbake/lib/bb/tests/fetch.py +44 -0
@@ -2936,6 +2936,50 @@ class FetchPremirroronlyNetworkTest(FetcherTest): with self.assertRaises(bb.fetch2.NetworkAccess): fetcher.download() +class FetchPremirroronlyMercurialTest(FetcherTest): + """ Test for premirrors with mercurial repos + the test covers also basic hg:// clone (see fetch_and_create_tarball + """ + def skipIfNoHg(): + import shutil + if not shutil.which('hg'): + return unittest.skip('Mercurial not installed') + return lambda f: f + + def setUp(self): + super(FetchPremirroronlyMercurialTest, self).setUp() + self.mirrordir = os.path.join(self.tempdir, "mirrors") + os.mkdir(self.mirrordir) + self.reponame = "libgnt" + self.clonedir = os.path.join(self.tempdir, "hg") + self.recipe_url = "hg://keep.imfreedom.org/libgnt;module=libgnt" + self.d.setVar("SRCREV", "53e8b422faaf") + self.mirrorname = "hg_libgnt_keep.imfreedom.org_.libgnt.tar.gz" + + def fetch_and_create_tarball(self): + """ + Ask bitbake to download repo and prepare mirror tarball for us + """ + self.d.setVar("BB_GENERATE_MIRROR_TARBALLS", "1") + fetcher = bb.fetch.Fetch([self.recipe_url], self.d) + fetcher.download() + mirrorfile = os.path.join(self.d.getVar("DL_DIR"), self.mirrorname) + self.assertTrue(os.path.exists(mirrorfile), "Mirror tarball {} has not been created".format(mirrorfile)) + ## moving tarball to mirror directory + os.rename(mirrorfile, os.path.join(self.mirrordir, self.mirrorname)) + self.d.setVar("BB_GENERATE_MIRROR_TARBALLS", "0") + + + @skipIfNoNetwork() + @skipIfNoHg() + def test_premirror_mercurial(self): + self.fetch_and_create_tarball() + self.d.setVar("PREMIRRORS", self.recipe_url + " " + "file://{}".format(self.mirrordir) + " \n") + self.d.setVar("BB_FETCH_PREMIRRORONLY", "1") + self.d.setVar("BB_NO_NETWORK", "1") + fetcher = bb.fetch.Fetch([self.recipe_url], self.d) + fetcher.download() + class FetchPremirroronlyBrokenTarball(FetcherTest): def setUp(self):
Signature · 1 line
2.39.0
Quoted 15 lines · Pavel Zhukov
Fixes:
File "/bitbake/./lib/bb/fetch2/__init__.py", line 446, inuri_replaceif uri_decoded[loc][k] != uri_find_decoded[loc][k]:KeyError: 'module'
Signed-off-by Pavel Zhukov <[email protected]>--- bitbake/lib/bb/fetch2/__init__.py | 1 + 1 file changed, 1 insertion(+)bitbake/lib/bb/fetch2/__init__.py +0
-0
bitbake/lib/bb/fetch2/__init__.py def uri_replace(ud, uri_find, uri_replace, replacements, d, mirrortarball=None): · line 475
Quoted 7 lines
bitbake/lib/bb/fetch2/__init__.py +1
-0@@ -469,6 +469,7 @@ def uri_replace(ud, uri_find, uri_replace, replacements, d, mirrortarball=None): basename = os.path.basename(mirrortarball) # Kill parameters, they make no sense for mirror tarballs uri_decoded[5] = {} + uri_find_decoded[5] = {} elif ud.localpath and ud.method.supports_checksum(ud): basename = os.path.basename(ud.localpath) if basename:
The fix looks reasonable but is there a test we should be adding to cover this scenario?
Cheers,
Richard
Quoted 11 lines · Richard Purdie
Quoted 10 lines · Pavel Zhukov
Fixes:
File "/bitbake/./lib/bb/fetch2/__init__.py", line 446, inuri_replaceif uri_decoded[loc][k] != uri_find_decoded[loc][k]:KeyError: 'module'
Signed-off-by Pavel Zhukov <[email protected]>--- bitbake/lib/bb/fetch2/__init__.py | 1 + 1 file changed, 1 insertion(+)
Quoted 15 lines
bitbake/lib/bb/fetch2/__init__.py def uri_replace(ud, uri_find, uri_replace, replacements, d, mirrortarball=None): · line 475
Quoted 12 lines
bitbake/lib/bb/fetch2/__init__.py +1
-0@@ -469,6 +469,7 @@ def uri_replace(ud, uri_find, uri_replace, replacements, d, mirrortarball=None): basename = os.path.basename(mirrortarball) # Kill parameters, they make no sense for mirror tarballs uri_decoded[5] = {} + uri_find_decoded[5] = {} elif ud.localpath and ud.method.supports_checksum(ud): basename = os.path.basename(ud.localpath) if basename:The fix looks reasonable but is there a test we should be adding to cover this scenario?
Mercurial test (second patch in the series) covers this but it will be executed only if network enabled and mercurial installed so I've modified existing git premirror local test to cover this change as well:
Subject: [PATCH] fetch2/tests: Add parameter to recipe_uri
Quoted 4 lines
Cheers,
Richard