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:23:41 +0100 |
commit | 9c0f6e81dae0b91b425e6c0cdf64caa5c15d92b5 (patch) | |
tree | b321a92a5fb4700e1e6e5e9d5add84818adf75e3 | |
parent | 04bd9c9341e8390a7923fa0122cd4cb0befa569f (diff) | |
download | bitbake-contrib-9c0f6e81dae0b91b425e6c0cdf64caa5c15d92b5.tar.gz |
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]
Signed-off-by: David Reyna <David.Reyna@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | lib/toaster/toastergui/static/js/importlayer.js | 2 | ||||
-rw-r--r-- | lib/toaster/toastergui/templates/importlayer.html | 2 | ||||
-rw-r--r-- | lib/toaster/toastergui/templates/projectconf.html | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/lib/toaster/toastergui/static/js/importlayer.js b/lib/toaster/toastergui/static/js/importlayer.js index 59652b9a3..296483985 100644 --- a/lib/toaster/toastergui/static/js/importlayer.js +++ b/lib/toaster/toastergui/static/js/importlayer.js @@ -418,7 +418,7 @@ function importLayerPageInit (ctx) { var input = $(this); var reBeginWithSlash = /^\//; var reCheckVariable = /^\$/; - var re = /([ <>\\|":\.%\?\*]+)/; + var re = /([ <>\\|":%\?\*]+)/; var invalidDir = re.test(input.val()); var invalidSlash = reBeginWithSlash.test(input.val()); diff --git a/lib/toaster/toastergui/templates/importlayer.html b/lib/toaster/toastergui/templates/importlayer.html index 7e5253e96..97d52c76c 100644 --- a/lib/toaster/toastergui/templates/importlayer.html +++ b/lib/toaster/toastergui/templates/importlayer.html @@ -126,7 +126,7 @@ <label for="local-dir-path" class="control-label">Enter the absolute path to the layer directory</label> <input type="text" class="form-control" id="local-dir-path" required/> <p class="help-block" id="hintError-dir-path-starts-with-slash" style="display:none;">The absolute path must start with "/".</p> - <p class="help-block" id="hintError-dir-path" style="display:none;">The directory path cannot include spaces or any of these characters: . \ ? % * : | " " < ></p> + <p class="help-block" id="hintError-dir-path" style="display:none;">The directory path cannot include spaces or any of these characters: \ ? % * : | " " < ></p> </div> </fieldset> diff --git a/lib/toaster/toastergui/templates/projectconf.html b/lib/toaster/toastergui/templates/projectconf.html index 0e9712b39..933c588f3 100644 --- a/lib/toaster/toastergui/templates/projectconf.html +++ b/lib/toaster/toastergui/templates/projectconf.html @@ -41,7 +41,7 @@ </div> <button id="apply-change-dl_dir" class="btn btn-default" type="button">Save</button> <button id="cancel-change-dl_dir" type="button" class="btn btn-link">Cancel</button> - <p class="help-block" id="hintError-dl_dir" style="display:none;">The directory path cannot include spaces or any of these characters: . \ ? % * : | " " < ></p> + <p class="help-block" id="hintError-dl_dir" style="display:none;">The directory path cannot include spaces or any of these characters: \ ? % * : | " " < ></p> <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> </form> </dd> @@ -151,7 +151,7 @@ </div> <button id="apply-change-sstate_dir" class="btn btn-default" type="button">Save</button> <button id="cancel-change-sstate_dir" type="button" class="btn btn-link">Cancel</button> - <p class="help-block" id="hintError-sstate_dir" style="display:none;">The directory path cannot include spaces or any of these characters: . \ ? % * : | " " < ></p> + <p class="help-block" id="hintError-sstate_dir" style="display:none;">The directory path cannot include spaces or any of these characters: \ ? % * : | " " < ></p> <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> </form> </dd> @@ -594,7 +594,7 @@ $(document).ready(function() { var input = $(this); var reBeginWithSlash = /^\//; var reCheckVariable = /^\$/; - var re = /([ <>\\|":\.%\?\*]+)/; + var re = /([ <>\\|":%\?\*]+)/; var invalidDir = re.test(input.val()); var invalidSlash = reBeginWithSlash.test(input.val()); var invalidVar = reCheckVariable.test(input.val()); @@ -961,7 +961,7 @@ $(document).ready(function() { var input = $(this); var reBeginWithSlash = /^\//; var reCheckVariable = /^\$/; - var re = /([ <>\\|":\.%\?\*]+)/; + var re = /([ <>\\|":%\?\*]+)/; var invalidDir = re.test(input.val()); var invalidSlash = reBeginWithSlash.test(input.val()); var invalidVar = reCheckVariable.test(input.val()); |