diff options
| author | lbonn <lbonn@users.noreply.github.com> | 2020-01-08 15:19:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-08 15:19:04 +0100 |
| commit | 2881b4a5c5efeed8558b1ab1e1cc6fd5979443bd (patch) | |
| tree | da7e10c3273896564052e7181e6b02e58e61d9dd | |
| parent | f1b40f5b59ff7b155f6fd214749b87d7af159a82 (diff) | |
| parent | ab593ba11aaf07f208063451c8e5186b54309370 (diff) | |
| download | meta-updater-2881b4a5c5efeed8558b1ab1e1cc6fd5979443bd.tar.gz | |
Allow dots in ostree branch names and hw ids (#657)
Allow dots in ostree branch names and hw ids
| -rw-r--r-- | classes/sota_sanity.bbclass | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/classes/sota_sanity.bbclass b/classes/sota_sanity.bbclass index 1339fb3..74973eb 100644 --- a/classes/sota_sanity.bbclass +++ b/classes/sota_sanity.bbclass | |||
| @@ -14,10 +14,10 @@ def sota_check_variables_validity(status, d): | |||
| 14 | import re | 14 | import re |
| 15 | import os.path | 15 | import os.path |
| 16 | 16 | ||
| 17 | if d.getVar("OSTREE_BRANCHNAME") and re.match("^[a-zA-Z0-9_-]*$", d.getVar("OSTREE_BRANCHNAME")) is None: | 17 | if d.getVar("OSTREE_BRANCHNAME") and re.match("^[a-zA-Z0-9._-]*$", d.getVar("OSTREE_BRANCHNAME")) is None: |
| 18 | status.addresult("OSTREE_BRANCHNAME Should only contain characters from the character set [a-zA-Z0-9_-].\n") | 18 | status.addresult("OSTREE_BRANCHNAME Should only contain characters from the character set [a-zA-Z0-9._-].\n") |
| 19 | if d.getVar("SOTA_HARDWARE_ID") and re.match("^[a-zA-Z0-9_-]*$", d.getVar("SOTA_HARDWARE_ID")) is None: | 19 | if d.getVar("SOTA_HARDWARE_ID") and re.match("^[a-zA-Z0-9._-]*$", d.getVar("SOTA_HARDWARE_ID")) is None: |
| 20 | status.addresult("SOTA_HARDWARE_ID Should only contain characters from the character set [a-zA-Z0-9_-].\n") | 20 | status.addresult("SOTA_HARDWARE_ID Should only contain characters from the character set [a-zA-Z0-9._-].\n") |
| 21 | if d.getVar("SOTA_CLIENT_FEATURES") is not None: | 21 | if d.getVar("SOTA_CLIENT_FEATURES") is not None: |
| 22 | for feat in d.getVar("SOTA_CLIENT_FEATURES").split(' '): | 22 | for feat in d.getVar("SOTA_CLIENT_FEATURES").split(' '): |
| 23 | if feat not in ("hsm", "serialcan", "ubootenv", ""): | 23 | if feat not in ("hsm", "serialcan", "ubootenv", ""): |