summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Bonnans <laurent.bonnans@here.com>2020-01-08 12:24:37 +0100
committerPatrick Vacek <patrickvacek@gmail.com>2020-01-15 12:24:05 +0100
commite9aaea1cdad182401e99d5061c724d2e6f84bc9a (patch)
tree64e847d1abac605608b930e06fa1e7ccce7e5c6f
parent008e95a59b6aadbceccec35eb09a8f35a3cd62c9 (diff)
downloadmeta-updater-e9aaea1cdad182401e99d5061c724d2e6f84bc9a.tar.gz
Allow dots in ostree branch names and hw ids
Signed-off-by: Laurent Bonnans <laurent.bonnans@here.com>
-rw-r--r--classes/sota_sanity.bbclass8
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", ""):