diff options
author | David Reyna <David.Reyna@windriver.com> | 2017-09-14 16:58:16 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-09-17 23:24:14 +0100 |
commit | ce57a391af3c4b7c9c91a65a82eb604a2665e910 (patch) | |
tree | f4c0622fa1074917c1418c3393d25f30979e48b8 /bitbake/lib/toaster | |
parent | d5a109daeaa7a83bfa2c34c45dc01a1579d24893 (diff) | |
download | poky-ce57a391af3c4b7c9c91a65a82eb604a2665e910.tar.gz |
bitbake: toaster: allow dots in user path names
The dot '.' character should be allowed in the user paths for
local non-git layers, DL_DIR, and SSTATE_DIR.
[YOCTO #10650]
(Bitbake rev: 9c0f6e81dae0b91b425e6c0cdf64caa5c15d92b5)
Signed-off-by: David Reyna <David.Reyna@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster')
3 files changed, 6 insertions, 6 deletions
diff --git a/bitbake/lib/toaster/toastergui/static/js/importlayer.js b/bitbake/lib/toaster/toastergui/static/js/importlayer.js index 59652b9a36..296483985a 100644 --- a/bitbake/lib/toaster/toastergui/static/js/importlayer.js +++ b/bitbake/lib/toaster/toastergui/static/js/importlayer.js | |||
@@ -418,7 +418,7 @@ function importLayerPageInit (ctx) { | |||
418 | var input = $(this); | 418 | var input = $(this); |
419 | var reBeginWithSlash = /^\//; | 419 | var reBeginWithSlash = /^\//; |
420 | var reCheckVariable = /^\$/; | 420 | var reCheckVariable = /^\$/; |
421 | var re = /([ <>\\|":\.%\?\*]+)/; | 421 | var re = /([ <>\\|":%\?\*]+)/; |
422 | 422 | ||
423 | var invalidDir = re.test(input.val()); | 423 | var invalidDir = re.test(input.val()); |
424 | var invalidSlash = reBeginWithSlash.test(input.val()); | 424 | var invalidSlash = reBeginWithSlash.test(input.val()); |
diff --git a/bitbake/lib/toaster/toastergui/templates/importlayer.html b/bitbake/lib/toaster/toastergui/templates/importlayer.html index 7e5253e963..97d52c76c1 100644 --- a/bitbake/lib/toaster/toastergui/templates/importlayer.html +++ b/bitbake/lib/toaster/toastergui/templates/importlayer.html | |||
@@ -126,7 +126,7 @@ | |||
126 | <label for="local-dir-path" class="control-label">Enter the absolute path to the layer directory</label> | 126 | <label for="local-dir-path" class="control-label">Enter the absolute path to the layer directory</label> |
127 | <input type="text" class="form-control" id="local-dir-path" required/> | 127 | <input type="text" class="form-control" id="local-dir-path" required/> |
128 | <p class="help-block" id="hintError-dir-path-starts-with-slash" style="display:none;">The absolute path must start with "/".</p> | 128 | <p class="help-block" id="hintError-dir-path-starts-with-slash" style="display:none;">The absolute path must start with "/".</p> |
129 | <p class="help-block" id="hintError-dir-path" style="display:none;">The directory path cannot include spaces or any of these characters: . \ ? % * : | " " < ></p> | 129 | <p class="help-block" id="hintError-dir-path" style="display:none;">The directory path cannot include spaces or any of these characters: \ ? % * : | " " < ></p> |
130 | </div> | 130 | </div> |
131 | </fieldset> | 131 | </fieldset> |
132 | 132 | ||
diff --git a/bitbake/lib/toaster/toastergui/templates/projectconf.html b/bitbake/lib/toaster/toastergui/templates/projectconf.html index 0e9712b39e..933c588f34 100644 --- a/bitbake/lib/toaster/toastergui/templates/projectconf.html +++ b/bitbake/lib/toaster/toastergui/templates/projectconf.html | |||
@@ -41,7 +41,7 @@ | |||
41 | </div> | 41 | </div> |
42 | <button id="apply-change-dl_dir" class="btn btn-default" type="button">Save</button> | 42 | <button id="apply-change-dl_dir" class="btn btn-default" type="button">Save</button> |
43 | <button id="cancel-change-dl_dir" type="button" class="btn btn-link">Cancel</button> | 43 | <button id="cancel-change-dl_dir" type="button" class="btn btn-link">Cancel</button> |
44 | <p class="help-block" id="hintError-dl_dir" style="display:none;">The directory path cannot include spaces or any of these characters: . \ ? % * : | " " < ></p> | 44 | <p class="help-block" id="hintError-dl_dir" style="display:none;">The directory path cannot include spaces or any of these characters: \ ? % * : | " " < ></p> |
45 | <p class="help-block" id="hintError-initialChar-dl_dir" style="display:none;">The directory path should either start with a /, e.g. /home/toaster/downloads; or with a variable, e.g. ${TOPDIR}/downloads.</p> | 45 | <p class="help-block" id="hintError-initialChar-dl_dir" style="display:none;">The directory path should either start with a /, e.g. /home/toaster/downloads; or with a variable, e.g. ${TOPDIR}/downloads.</p> |
46 | </form> | 46 | </form> |
47 | </dd> | 47 | </dd> |
@@ -151,7 +151,7 @@ | |||
151 | </div> | 151 | </div> |
152 | <button id="apply-change-sstate_dir" class="btn btn-default" type="button">Save</button> | 152 | <button id="apply-change-sstate_dir" class="btn btn-default" type="button">Save</button> |
153 | <button id="cancel-change-sstate_dir" type="button" class="btn btn-link">Cancel</button> | 153 | <button id="cancel-change-sstate_dir" type="button" class="btn btn-link">Cancel</button> |
154 | <p class="help-block" id="hintError-sstate_dir" style="display:none;">The directory path cannot include spaces or any of these characters: . \ ? % * : | " " < ></p> | 154 | <p class="help-block" id="hintError-sstate_dir" style="display:none;">The directory path cannot include spaces or any of these characters: \ ? % * : | " " < ></p> |
155 | <p class="help-block" id="hintError-initialChar-sstate_dir" style="display:none;">The directory path should either start with a /, e.g. /home/toaster/sstate-cache; or with a variable, e.g. ${TOPDIR}/sstate-cache.</p> | 155 | <p class="help-block" id="hintError-initialChar-sstate_dir" style="display:none;">The directory path should either start with a /, e.g. /home/toaster/sstate-cache; or with a variable, e.g. ${TOPDIR}/sstate-cache.</p> |
156 | </form> | 156 | </form> |
157 | </dd> | 157 | </dd> |
@@ -594,7 +594,7 @@ $(document).ready(function() { | |||
594 | var input = $(this); | 594 | var input = $(this); |
595 | var reBeginWithSlash = /^\//; | 595 | var reBeginWithSlash = /^\//; |
596 | var reCheckVariable = /^\$/; | 596 | var reCheckVariable = /^\$/; |
597 | var re = /([ <>\\|":\.%\?\*]+)/; | 597 | var re = /([ <>\\|":%\?\*]+)/; |
598 | var invalidDir = re.test(input.val()); | 598 | var invalidDir = re.test(input.val()); |
599 | var invalidSlash = reBeginWithSlash.test(input.val()); | 599 | var invalidSlash = reBeginWithSlash.test(input.val()); |
600 | var invalidVar = reCheckVariable.test(input.val()); | 600 | var invalidVar = reCheckVariable.test(input.val()); |
@@ -961,7 +961,7 @@ $(document).ready(function() { | |||
961 | var input = $(this); | 961 | var input = $(this); |
962 | var reBeginWithSlash = /^\//; | 962 | var reBeginWithSlash = /^\//; |
963 | var reCheckVariable = /^\$/; | 963 | var reCheckVariable = /^\$/; |
964 | var re = /([ <>\\|":\.%\?\*]+)/; | 964 | var re = /([ <>\\|":%\?\*]+)/; |
965 | var invalidDir = re.test(input.val()); | 965 | var invalidDir = re.test(input.val()); |
966 | var invalidSlash = reBeginWithSlash.test(input.val()); | 966 | var invalidSlash = reBeginWithSlash.test(input.val()); |
967 | var invalidVar = reCheckVariable.test(input.val()); | 967 | var invalidVar = reCheckVariable.test(input.val()); |