Skip to content

Commit

Permalink
Skip RELEASE checking for EMPTY jails (#68)
Browse files Browse the repository at this point in the history
During configuration upgrade, this will cause real headaches.

FreeNAS Ticket: #52637
  • Loading branch information
Brandon Schneider committed Oct 24, 2018
1 parent 3061473 commit 26a7bdf
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion iocage_lib/ioc_json.py
Original file line number Diff line number Diff line change
Expand Up @@ -906,6 +906,8 @@ def json_check_config(self, conf, default=False):
if release[:4].endswith("-"):
# 9.3-RELEASE and under don't actually have this binary.
release = conf["release"]
elif release == 'EMPTY':
pass
else:
try:
with open(freebsd_version, "r") as r:
Expand All @@ -919,7 +921,7 @@ def json_check_config(self, conf, default=False):
'level': 'EXCEPTION',
'message': 'Exception:'
f' "{e.__class__.__name__}:{str(e)}" occured\n'
"Loading {uuid}'s configuration failed"
f"Loading {uuid}'s configuration failed"
}
)

Expand Down

0 comments on commit 26a7bdf

Please sign in to comment.