If INSTALLER_TYPE is unset, is_compatible returns False instead of
raising an ErrorType exception.
Change-Id: I55c219808851907a19e2aa0124eb13d53a5e685d
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
self.description = description
def is_compatible(self, ci_installer, ci_scenario):
- if re.search(self.dependency.get_installer(), ci_installer) is None:
+ try:
+ return not (re.search(self.dependency.get_installer(),
+ ci_installer) is None or
+ re.search(self.dependency.get_scenario(),
+ ci_scenario) is None)
+ except TypeError:
return False
- if re.search(self.dependency.get_scenario(), ci_scenario) is None:
- return False
-
- return True
-
def get_name(self):
return self.name