sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

bitbake: toaster: Allow forward slash in variable names 

Add forward slash to the list of special characters allowed in variable
names. Also update the list of allowed special characters in the error
messages.

[YOCTO #9611]

(Bitbake rev: 146f6f95a8753308edb31e952d7c440c8de11870)

Signed-off-by: Belen Barros Pena <belen.barros.pena@linux.intel.com>
Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Belen Barros Pena 2016-09-05 15:29:27 +01:00 committed by Richard Purdie
parent b5070f5337
commit 8ba4f54037
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bitbake/lib/toaster/toastergui/static/css/default.css
View File

@ -182,6 +182,7 @@ dd.variable-list form { margin-top: 10px; }
.scrolling.has-error { border-color: #a94442; }
.help-block.text-danger { color: #a94442; }
.tooltip-inner code { color: #fff; }
.text-danger > code { color: #a94442; }
dd.variable-list .glyphicon-question-sign { font-size: 14px; }
dd.variable-list .glyphicon-edit { font-size: 16px; }
dt .glyphicon-trash { margin-left: 5px; font-size: 16px; }

6
bitbake/lib/toaster/toastergui/templates/projectconf.html
View File

@ -251,16 +251,16 @@ function validate_new_variable() {
}
}
var bad_chars = /[^a-zA-Z0-9\-_]/.test(variable);
var bad_chars = /[^a-zA-Z0-9\-_/]/.test(variable);
var has_spaces = (0 <= variable.indexOf(" "));
var only_spaces = (0 < variable.length) && (0 == variable.trim().length);
if (only_spaces) {
error_msg = "A valid variable name cannot include spaces";
} else if (bad_chars && has_spaces) {
error_msg = "A valid variable name can only include letters, numbers, underscores, dashes, and cannot include spaces";
error_msg = "A valid variable name can only include letters, numbers and the special characters <code> _ - /</code>. Variable names cannot include spaces";
} else if (bad_chars) {
error_msg = "A valid variable name can only include letters, numbers, underscores, and dashes";
error_msg = "A valid variable name can only include letters, numbers and the special characters <code>_ - /</code>";
}
if ("" != error_msg) {