From 4c1ded3ddbd04ad1640620ec1348831692a93dbe Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Tue, 13 Jun 2017 14:22:01 +0300 Subject: wic: add Disk._prop helper Added generic helper to use in property methods to access commands in a lazy manner. Signed-off-by: Ed Bartosh Signed-off-by: Richard Purdie --- scripts/lib/wic/engine.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/scripts/lib/wic/engine.py b/scripts/lib/wic/engine.py index f8f2844cf6..e3701c442e 100644 --- a/scripts/lib/wic/engine.py +++ b/scripts/lib/wic/engine.py @@ -267,13 +267,18 @@ class Disk: return self._partitions + def _prop(self, name): + """Get path to the executable in a lazy way.""" + aname = "_%s" % name + if getattr(self, aname) is None: + setattr(self, aname, find_executable(name, self.paths)) + if not getattr(self, aname): + raise WicError("Can't find executable {}".format(name)) + return getattr(self, aname) + @property def mdir(self): - if self._mdir is None: - self._mdir = find_executable("mdir", self.paths) - if not self._mdir: - raise WicError("Can't find executable mdir") - return self._mdir + return self._prop('mdir') def _get_part_image(self, pnum): if pnum not in self.partitions: -- cgit 1.2.3-korg