diff options
Diffstat (limited to 'meta/lib/oeqa/runtime/decorator/package.py')
| -rw-r--r-- | meta/lib/oeqa/runtime/decorator/package.py | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/meta/lib/oeqa/runtime/decorator/package.py b/meta/lib/oeqa/runtime/decorator/package.py index 2d7e174dbf..b78ac9fc38 100644 --- a/meta/lib/oeqa/runtime/decorator/package.py +++ b/meta/lib/oeqa/runtime/decorator/package.py @@ -5,7 +5,6 @@ # from oeqa.core.decorator import OETestDecorator, registerDecorator -from oeqa.core.utils.misc import strToSet @registerDecorator class OEHasPackage(OETestDecorator): @@ -34,12 +33,17 @@ class OEHasPackage(OETestDecorator): def setUpDecorator(self): need_pkgs = set() unneed_pkgs = set() - pkgs = strToSet(self.need_pkgs) - for pkg in pkgs: + + # Turn literal strings into a list so we can just iterate over it + if isinstance(self.need_pkgs, str): + self.need_pkgs = [self.need_pkgs,] + + mlprefix = self.case.td.get("MLPREFIX") + for pkg in self.need_pkgs: if pkg.startswith('!'): - unneed_pkgs.add(pkg[1:]) + unneed_pkgs.add(mlprefix + pkg[1:]) else: - need_pkgs.add(pkg) + need_pkgs.add(mlprefix + pkg) if unneed_pkgs: msg = 'Checking if %s is not installed' % ', '.join(unneed_pkgs) |