combo-layer: handle unset dest_dir in sanity_check()
The previous "clean up dest_dir checking" patch (f8cdbe7497) improved handling of empty dest_dir but made handling of unset dest_dir worse: instead showing the "Option dest_dir is not defined for component ..." error, it fails with a Python exception. Avoid that by providing a sane fallback for the unset case. With that change, dest_dir is no longer strictly required, but the check for it is kept to ensure that a combo-layer.conf also works with older combo-layer versions. [Yocto #7773] (From OE-Core rev: d4bf858b2c15bef128fd6d606b08203a318e2d4c) Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
c60aac5c94
commit
45b8e62439
|
@ -145,8 +145,10 @@ class Configuration(object):
|
||||||
msg = "%s\nOption %s is not defined for component %s" %(msg, option, name)
|
msg = "%s\nOption %s is not defined for component %s" %(msg, option, name)
|
||||||
missing_options.append(option)
|
missing_options.append(option)
|
||||||
# Sanitize dest_dir so that we do not have to deal with edge cases
|
# Sanitize dest_dir so that we do not have to deal with edge cases
|
||||||
# (empty string, double slashes) in the rest of the code.
|
# (unset, empty string, double slashes) in the rest of the code.
|
||||||
dest_dir = os.path.normpath(self.repos[name]["dest_dir"])
|
# It not being set will still be flagged as error because it is
|
||||||
|
# listed as required option above; that could be changed now.
|
||||||
|
dest_dir = os.path.normpath(self.repos[name].get("dest_dir", "."))
|
||||||
self.repos[name]["dest_dir"] = "." if not dest_dir else dest_dir
|
self.repos[name]["dest_dir"] = "." if not dest_dir else dest_dir
|
||||||
if msg != "":
|
if msg != "":
|
||||||
logger.error("configuration file %s has the following error: %s" % (self.conffile,msg))
|
logger.error("configuration file %s has the following error: %s" % (self.conffile,msg))
|
||||||
|
|
Loading…
Reference in New Issue