diff options
Diffstat (limited to 'scripts/combo-layer')
| -rwxr-xr-x | scripts/combo-layer | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/combo-layer b/scripts/combo-layer index b0b7c28bea..698d3e3baa 100755 --- a/scripts/combo-layer +++ b/scripts/combo-layer | |||
| @@ -145,8 +145,10 @@ class Configuration(object): | |||
| 145 | msg = "%s\nOption %s is not defined for component %s" %(msg, option, name) | 145 | msg = "%s\nOption %s is not defined for component %s" %(msg, option, name) |
| 146 | missing_options.append(option) | 146 | missing_options.append(option) |
| 147 | # Sanitize dest_dir so that we do not have to deal with edge cases | 147 | # Sanitize dest_dir so that we do not have to deal with edge cases |
| 148 | # (empty string, double slashes) in the rest of the code. | 148 | # (unset, empty string, double slashes) in the rest of the code. |
| 149 | dest_dir = os.path.normpath(self.repos[name]["dest_dir"]) | 149 | # It not being set will still be flagged as error because it is |
| 150 | # listed as required option above; that could be changed now. | ||
| 151 | dest_dir = os.path.normpath(self.repos[name].get("dest_dir", ".")) | ||
| 150 | self.repos[name]["dest_dir"] = "." if not dest_dir else dest_dir | 152 | self.repos[name]["dest_dir"] = "." if not dest_dir else dest_dir |
| 151 | if msg != "": | 153 | if msg != "": |
| 152 | logger.error("configuration file %s has the following error: %s" % (self.conffile,msg)) | 154 | logger.error("configuration file %s has the following error: %s" % (self.conffile,msg)) |
