StealthOS/subiquity
StealthOS
/
subiquity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support special paths for environment check binaries in snaps.

This commit is contained in:
Mathieu Trudel-Lapierre 2017-03-03 15:38:47 -05:00
parent d07abbe250
commit 3098d108b2
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
subiquitycore/utils.py
View File

@ -68,10 +68,18 @@ def environment_check(check):
for ftype, items in checks[check_type].items():
for i in items:
if not os.path.exists(i):
log.error('FAIL: {} is not found on the'
' filesystem'.format(i))
env_ok = False
continue
if 'SNAP' in os.environ:
log.warn("Adjusting path for snaps: {}".format(os.environ.get('SNAP')))
i = os.environ.get('SNAP') + i
if not os.path.exists(i):
env_ok = False
else:
env_ok = False
if not env_ok:
log.error('FAIL: {} is not found on the'
' filesystem'.format(i))
continue
if check_map[ftype](i) is False:
log.error('FAIL: {} is NOT of type: {}'.format(i, ftype))
env_ok = False