nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

scripts/target_lib.lua: print a meaningful error message for missing site_code (#2094)

Browse Source 
site_code is evaluated early during config generation, so a site.conf
without site_code would hit this assertion that just printed 'Assertion
failed'. Add a proper error message to tell users what went wrong.

The inner assert() is removed, as it should never be hit (as site.conf
syntax will have already been validated when this script runs), and it
doesn't add anything (even without the assert, the attempt to index a
nil value would throw an error).
This commit is contained in:
Matthias Schiffer 2020-08-15 13:59:54 +02:00 committed by GitHub
parent b66dcd0477
commit bd0133ad37
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/target_lib.lua
View File

@ -21,7 +21,9 @@ assert(env.GLUON_RELEASE)
assert(env.GLUON_DEPRECATED) assert(env.GLUON_DEPRECATED)
M.site_code = assert(assert(dofile('scripts/site_config.lua')('site.conf')).site_code) M.site_code = assert(
dofile('scripts/site_config.lua')('site.conf').site_code, 'site_code missing in site.conf'
)
M.target_packages = {} M.target_packages = {}
M.configs = {} M.configs = {}
M.devices = {} M.devices = {}