summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
authorCorneliu Stoicescu <corneliux.stoicescu@intel.com>2014-06-23 15:59:44 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-24 19:54:10 +0100
commit7b453165ab347c8ab9da7a9981f6db971e99fcf4 (patch)
treee00a69a59714a247879d4ebe9f634a3643450c92 /meta/lib
parentd7b3683834f9095d7c1144fda18b2a34b85cf339 (diff)
downloadpoky-7b453165ab347c8ab9da7a9981f6db971e99fcf4.tar.gz
oeqa/targetcontrol.py: Separate the matching of supported image fstypes from the resulting value check.
Because we used a bb.fatal call inside the get_image_fstype classmethod, this caused problems when accessed without instantiating the object with a valid bb environment. Separating the matching part of the classmethod(that is usable by outside scripts) from the check of the resulting value. The matching is done within a new classmethod and the latter keeps the old method name and internal functionality, this way we don't have to change any other target controllers code. (From OE-Core rev: 50ddd5d0149666ad60133d8eb6cc789c5b97e5e4) Signed-off-by: Corneliu Stoicescu <corneliux.stoicescu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oeqa/targetcontrol.py11
1 files changed, 9 insertions, 2 deletions
diff --git a/meta/lib/oeqa/targetcontrol.py b/meta/lib/oeqa/targetcontrol.py
index 1464bf4047..cc582dd1ad 100644
--- a/meta/lib/oeqa/targetcontrol.py
+++ b/meta/lib/oeqa/targetcontrol.py
@@ -77,14 +77,21 @@ class BaseTarget(object):
77 return None 77 return None
78 78
79 @classmethod 79 @classmethod
80 def get_image_fstype(self, d, image_fstypes=None): 80 def match_image_fstype(self, d, image_fstypes=None):
81 if not image_fstypes: 81 if not image_fstypes:
82 image_fstypes = d.getVar('IMAGE_FSTYPES', True).split(' ') 82 image_fstypes = d.getVar('IMAGE_FSTYPES', True).split(' ')
83 possible_image_fstypes = [fstype for fstype in self.supported_image_fstypes if fstype in image_fstypes] 83 possible_image_fstypes = [fstype for fstype in self.supported_image_fstypes if fstype in image_fstypes]
84 if possible_image_fstypes: 84 if possible_image_fstypes:
85 return possible_image_fstypes[0] 85 return possible_image_fstypes[0]
86 else: 86 else:
87 bb.fatal("no possible image_fstype could not be determined. IMAGE_FSTYPES=\"%s\" and supported_image_fstypes=\"%s\": " % (', '.join(map(str, image_fstypes)), ', '.join(map(str, self.supported_image_fstypes)))) 87 return None
88
89 def get_image_fstype(self, d):
90 image_fstype = self.match_image_fstype(d)
91 if image_fstype:
92 return image_fstype
93 else:
94 bb.fatal("IMAGE_FSTYPES should contain a Target Controller supported image fstype: %s " % ', '.join(map(str, self.supported_image_fstypes)))
88 95
89 def restart(self, params=None): 96 def restart(self, params=None):
90 self.stop() 97 self.stop()