diff options
author | Joshua Lock <joshua.g.lock@intel.com> | 2016-12-14 21:13:04 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-12-16 10:23:23 +0000 |
commit | c4e2c59088765d1f1de7ec57cde91980f887c2ff (patch) | |
tree | a2fda8ac5916fb59a711e9220c2177008cca9347 /meta/lib/oeqa/utils/package_manager.py | |
parent | d5e67725ac11e3296cad104470931ffa16824b90 (diff) | |
download | poky-c4e2c59088765d1f1de7ec57cde91980f887c2ff.tar.gz |
meta: remove True option to getVar calls
getVar() now defaults to expanding by default, thus remove the True
option from getVar() calls with a regex search and replace.
Search made with the following regex: getVar ?\(( ?[^,()]*), True\)
(From OE-Core rev: 7c552996597faaee2fbee185b250c0ee30ea3b5f)
Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa/utils/package_manager.py')
-rw-r--r-- | meta/lib/oeqa/utils/package_manager.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/lib/oeqa/utils/package_manager.py b/meta/lib/oeqa/utils/package_manager.py index 099ecc9728..0f6bdbc542 100644 --- a/meta/lib/oeqa/utils/package_manager.py +++ b/meta/lib/oeqa/utils/package_manager.py | |||
@@ -4,24 +4,24 @@ def get_package_manager(d, root_path): | |||
4 | """ | 4 | """ |
5 | from oe.package_manager import RpmPM, OpkgPM, DpkgPM | 5 | from oe.package_manager import RpmPM, OpkgPM, DpkgPM |
6 | 6 | ||
7 | pkg_class = d.getVar("IMAGE_PKGTYPE", True) | 7 | pkg_class = d.getVar("IMAGE_PKGTYPE") |
8 | if pkg_class == "rpm": | 8 | if pkg_class == "rpm": |
9 | pm = RpmPM(d, | 9 | pm = RpmPM(d, |
10 | root_path, | 10 | root_path, |
11 | d.getVar('TARGET_VENDOR', True)) | 11 | d.getVar('TARGET_VENDOR')) |
12 | pm.create_configs() | 12 | pm.create_configs() |
13 | 13 | ||
14 | elif pkg_class == "ipk": | 14 | elif pkg_class == "ipk": |
15 | pm = OpkgPM(d, | 15 | pm = OpkgPM(d, |
16 | root_path, | 16 | root_path, |
17 | d.getVar("IPKGCONF_TARGET", True), | 17 | d.getVar("IPKGCONF_TARGET"), |
18 | d.getVar("ALL_MULTILIB_PACKAGE_ARCHS", True)) | 18 | d.getVar("ALL_MULTILIB_PACKAGE_ARCHS")) |
19 | 19 | ||
20 | elif pkg_class == "deb": | 20 | elif pkg_class == "deb": |
21 | pm = DpkgPM(d, | 21 | pm = DpkgPM(d, |
22 | root_path, | 22 | root_path, |
23 | d.getVar('PACKAGE_ARCHS', True), | 23 | d.getVar('PACKAGE_ARCHS'), |
24 | d.getVar('DPKG_ARCH', True)) | 24 | d.getVar('DPKG_ARCH')) |
25 | 25 | ||
26 | pm.write_index() | 26 | pm.write_index() |
27 | pm.update() | 27 | pm.update() |