diff options
author | Ross Burton <ross@burtonini.com> | 2022-03-31 19:29:02 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-04-01 23:11:37 +0100 |
commit | b9df97f59c8369a01678e1851cabfedefffe2ea4 (patch) | |
tree | d32574b71a5a4c1e03bd93b478d0b55e7dc77b5a /meta/lib/oeqa | |
parent | dd6987f49b258475c81be42c4c2bc3d30316dafd (diff) | |
download | poky-b9df97f59c8369a01678e1851cabfedefffe2ea4.tar.gz |
oeqa/runtime/decorator/package.py: remove use of strToSet
There's no need to use a series of over-generalised functions to just
wrap a string in a tuple.
(From OE-Core rev: 080854fe346a76f5fbe25058ba1b2425a0459b5e)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa')
-rw-r--r-- | meta/lib/oeqa/runtime/decorator/package.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/meta/lib/oeqa/runtime/decorator/package.py b/meta/lib/oeqa/runtime/decorator/package.py index 2d7e174dbf..8aba3f325b 100644 --- a/meta/lib/oeqa/runtime/decorator/package.py +++ b/meta/lib/oeqa/runtime/decorator/package.py | |||
@@ -5,7 +5,6 @@ | |||
5 | # | 5 | # |
6 | 6 | ||
7 | from oeqa.core.decorator import OETestDecorator, registerDecorator | 7 | from oeqa.core.decorator import OETestDecorator, registerDecorator |
8 | from oeqa.core.utils.misc import strToSet | ||
9 | 8 | ||
10 | @registerDecorator | 9 | @registerDecorator |
11 | class OEHasPackage(OETestDecorator): | 10 | class OEHasPackage(OETestDecorator): |
@@ -34,8 +33,12 @@ class OEHasPackage(OETestDecorator): | |||
34 | def setUpDecorator(self): | 33 | def setUpDecorator(self): |
35 | need_pkgs = set() | 34 | need_pkgs = set() |
36 | unneed_pkgs = set() | 35 | unneed_pkgs = set() |
37 | pkgs = strToSet(self.need_pkgs) | 36 | |
38 | for pkg in pkgs: | 37 | # Turn literal strings into a list so we can just iterate over it |
38 | if isinstance(self.need_pkgs, str): | ||
39 | self.need_pkgs = [self.need_pkgs,] | ||
40 | |||
41 | for pkg in self.need_pkgs: | ||
39 | if pkg.startswith('!'): | 42 | if pkg.startswith('!'): |
40 | unneed_pkgs.add(pkg[1:]) | 43 | unneed_pkgs.add(pkg[1:]) |
41 | else: | 44 | else: |