diff options
| author | Steve Sakoman <steve@sakoman.com> | 2020-12-23 04:11:49 -1000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-01-01 11:55:35 +0000 |
| commit | c0cf641dc8b46be616c7edc01e6f26141f26cba7 (patch) | |
| tree | 4c28d6c344fef9db011cc12a830edaf77bdacb14 /meta | |
| parent | 7a36e544382ea770b5bd7172b35a0d884694d5bd (diff) | |
| download | poky-c0cf641dc8b46be616c7edc01e6f26141f26cba7.tar.gz | |
oeqa/selftest/cases/devtool.py: fix typo in ignore_patterns call
Causes intermittent autobuilder errors:
2020-12-21 19:34:23,035 - oe-selftest - INFO - testtools.testresult.real._StringException: Traceback (most recent call last):
File "/home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/meta/lib/oeqa/selftest/cases/devtool.py", line 68, in setUpModule
bb.utils.edit_bblayers_conf(bblayers_conf, None, None, bblayers_edit_cb)
File "/home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/bitbake/lib/bb/utils.py", line 1460, in edit_bblayers_conf
(updated, newlines) = edit_metadata(newlines, ['BBLAYERS'], handle_bblayers)
File "/home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/bitbake/lib/bb/utils.py", line 1290, in edit_metadata
if handle_var_end():
File "/home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/bitbake/lib/bb/utils.py", line 1215, in handle_var_end
(newvalue, newop, indent, minbreak) = varfunc(in_var, full_value, op, newlines)
File "/home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/bitbake/lib/bb/utils.py", line 1425, in handle_bblayers
res = edit_cb(layer, canonicalise_path(layer))
File "/home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/meta/lib/oeqa/selftest/cases/devtool.py", line 60, in bblayers_edit_cb
shutil.copytree(pth, destdir, ignore=ignore_patterns('*.pyc', '__pycache__'))
NameError: name 'ignore_patterns' is not defined
(From OE-Core rev: 8bfc666b7cddf37b7681e45dd0f87365014ac5a3)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit c2d9612279fce9cbcb738913b2042949f692c4a5)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/lib/oeqa/selftest/cases/devtool.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py index 5f59d14402..ddf46547de 100644 --- a/meta/lib/oeqa/selftest/cases/devtool.py +++ b/meta/lib/oeqa/selftest/cases/devtool.py | |||
| @@ -57,7 +57,7 @@ def setUpModule(): | |||
| 57 | if relpth.endswith('/'): | 57 | if relpth.endswith('/'): |
| 58 | destdir = os.path.join(corecopydir, relpth) | 58 | destdir = os.path.join(corecopydir, relpth) |
| 59 | # avoid race condition by not copying .pyc files YPBZ#13421,13803 | 59 | # avoid race condition by not copying .pyc files YPBZ#13421,13803 |
| 60 | shutil.copytree(pth, destdir, ignore=ignore_patterns('*.pyc', '__pycache__')) | 60 | shutil.copytree(pth, destdir, ignore=shutil.ignore_patterns('*.pyc', '__pycache__')) |
| 61 | else: | 61 | else: |
| 62 | destdir = os.path.join(corecopydir, os.path.dirname(relpth)) | 62 | destdir = os.path.join(corecopydir, os.path.dirname(relpth)) |
| 63 | bb.utils.mkdirhier(destdir) | 63 | bb.utils.mkdirhier(destdir) |