diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2023-02-01 16:50:38 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-02-02 09:50:02 +0000 |
commit | 94149c4f374f31d5c780fd33e947170530cd81ec (patch) | |
tree | 2f4c9e8666efc8e0bbac014a13b5a15d738a5f9d /meta/lib/oe | |
parent | 8c36e1557f51934bfc0172909d80f4d7825dd6d0 (diff) | |
download | poky-94149c4f374f31d5c780fd33e947170530cd81ec.tar.gz |
meta: remove True option to getVar and getVarFlag calls (again)
* True is default since 2016 and most layers were already updated
not to pass this parameter where not necessary, e.g. oe-core was
updated couple times, first in:
https://git.openembedded.org/openembedded-core/commit/?id=7c552996597faaee2fbee185b250c0ee30ea3b5f
Updated with the same regexp as later oe-core update:
https://git.openembedded.org/openembedded-core/commit/?id=9f551d588693328e4d99d33be94f26684eafcaba
with small modification to replace not only d.getVar, but also data.getVar as in e.g.:
e.data.getVar('ERR_REPORT_USERNAME', True)
and for getVarFlag:
sed -e 's|\(d\.getVarFlag \?\)( \?\([^,()]*, \?[^,()]*\), \?True)|\1(\2)|g' \
-i $(git grep -E 'getVarFlag ?\( ?([^,()]*), ?([^,()]*), ?True\)' \
| cut -d':' -f1 \
| sort -u)
(From OE-Core rev: 26c74fd10614582e177437608908eb43688ab510)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe')
-rw-r--r-- | meta/lib/oe/package_manager/deb/__init__.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/lib/oe/package_manager/deb/__init__.py b/meta/lib/oe/package_manager/deb/__init__.py index c672454072..0c23c884c1 100644 --- a/meta/lib/oe/package_manager/deb/__init__.py +++ b/meta/lib/oe/package_manager/deb/__init__.py | |||
@@ -82,15 +82,15 @@ class DpkgIndexer(Indexer): | |||
82 | return | 82 | return |
83 | 83 | ||
84 | oe.utils.multiprocess_launch(create_index, index_cmds, self.d) | 84 | oe.utils.multiprocess_launch(create_index, index_cmds, self.d) |
85 | if self.d.getVar('PACKAGE_FEED_SIGN', True) == '1': | 85 | if self.d.getVar('PACKAGE_FEED_SIGN') == '1': |
86 | signer = get_signer(self.d, self.d.getVar('PACKAGE_FEED_GPG_BACKEND', True)) | 86 | signer = get_signer(self.d, self.d.getVar('PACKAGE_FEED_GPG_BACKEND')) |
87 | else: | 87 | else: |
88 | signer = None | 88 | signer = None |
89 | if signer: | 89 | if signer: |
90 | for f in index_sign_files: | 90 | for f in index_sign_files: |
91 | signer.detach_sign(f, | 91 | signer.detach_sign(f, |
92 | self.d.getVar('PACKAGE_FEED_GPG_NAME', True), | 92 | self.d.getVar('PACKAGE_FEED_GPG_NAME'), |
93 | self.d.getVar('PACKAGE_FEED_GPG_PASSPHRASE_FILE', True), | 93 | self.d.getVar('PACKAGE_FEED_GPG_PASSPHRASE_FILE'), |
94 | output_suffix="gpg", | 94 | output_suffix="gpg", |
95 | use_sha256=True) | 95 | use_sha256=True) |
96 | 96 | ||