summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2020-03-15 01:24:07 -0500
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2020-03-15 01:24:07 -0500
commitc2ecca9f2a16dc35a268eb94ea2b8c03584b4a22 (patch)
tree0128defdfbf3289d5c3f782109d47cf7db20f2bb
parentc04a7e8ecd3a29b3ca2671b202b39be487d7c594 (diff)
downloadhorizon-c2ecca9f2a16dc35a268eb94ea2b8c03584b4a22.tar.gz
horizon-c2ecca9f2a16dc35a268eb94ea2b8c03584b4a22.tar.bz2
horizon-c2ecca9f2a16dc35a268eb94ea2b8c03584b4a22.tar.xz
horizon-c2ecca9f2a16dc35a268eb94ea2b8c03584b4a22.zip
meta: Handle underscores in architecture names
Otherwise, x86_64 and aarch64_be fail instantly: installfile:6: error: arch: expected CPU architecture name: 'x86_64' is not a valid CPU architecture name
-rw-r--r--hscript/meta.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/hscript/meta.cc b/hscript/meta.cc
index 8fedb32..2f4e4eb 100644
--- a/hscript/meta.cc
+++ b/hscript/meta.cc
@@ -179,7 +179,7 @@ static std::set<std::string> valid_arches = {
Key *Arch::parseFromData(const std::string &data, int lineno, int *errors,
int *warnings, const Script *script) {
- if(data.find_first_not_of("abcdefghijklmnopqrstuvwyxz1234567890") !=
+ if(data.find_first_not_of("abcdefghijklmnopqrstuvwyxz1234567890_") !=
std::string::npos) {
if(errors) *errors += 1;
output_error("installfile:" + std::to_string(lineno),