Allow user to use higher minor version number jails

(cherry picked from commit 38032fe)

Author: sonicaj

iocage_cli/create.py

@@ -164,7 +164,7 @@ def cli(
 
     if release:
         try:
-            ioc_common.check_release_newer(release)
+            ioc_common.check_release_newer(release, major_only=True)
         except ValueError:
             # We're assuming they understand the implications of a custom
             # scheme
@@ -173,7 +173,7 @@ def cli(
             _release = ioc_common.get_jail_freebsd_version(path, release)
 
             try:
-                ioc_common.check_release_newer(_release)
+                ioc_common.check_release_newer(_release, major_only=True)
             except ValueError:
                 # We tried
                 pass

iocage_cli/fetch.py

@@ -176,6 +176,6 @@ def cli(**kwargs):
             })
 
         if not _file:
-            ioc_common.check_release_newer(release)
+            ioc_common.check_release_newer(release, major_only=True)
 
     ioc.IOCage().fetch(**kwargs)

iocage_lib/ioc_fetch.py

@@ -174,7 +174,7 @@ def __fetch_validate_release__(self, releases, eol=None):
         try:
             self.release = releases[int(self.release)]
             iocage_lib.ioc_common.check_release_newer(
-                self.release, self.callback, self.silent)
+                self.release, self.callback, self.silent, major_only=True)
         except IndexError:
             # Time to print the list again
             self.release = self.__fetch_validate_release__(releases)
@@ -209,7 +209,8 @@ def fetch_release(self, _list=False):
 
             if self.release:
                 iocage_lib.ioc_common.check_release_newer(
-                    self.release, callback=self.callback, silent=self.silent
+                    self.release, callback=self.callback, silent=self.silent,
+                    major_only=True,
                 )
             rel = self.fetch_http_release(eol, _list=_list)
 

iocage_lib/ioc_plugin.py

@@ -448,15 +448,15 @@ def __fetch_plugin_props__(self, conf, props, num):
 
             if not os.path.isdir(f"{self.iocroot}/releases/{self.release}"):
                 iocage_lib.ioc_common.check_release_newer(
-                    self.release, self.callback, self.silent)
+                    self.release, self.callback, self.silent, major_only=True)
                 self.__fetch_release__(self.release)
 
         if conf["release"][:4].endswith("-"):
             # 9.3-RELEASE and under don't actually have this binary.
             release = conf["release"]
         else:
             iocage_lib.ioc_common.check_release_newer(
-                self.release, self.callback, self.silent)
+                self.release, self.callback, self.silent, major_only=True)
 
             try:
                 with open(
@@ -1241,7 +1241,7 @@ def upgrade(self, jid):
         self.__check_manifest__(plugin_conf)
         plugin_release = plugin_conf["release"]
         iocage_lib.ioc_common.check_release_newer(
-            plugin_release, self.callback, self.silent)
+            plugin_release, self.callback, self.silent, major_only=True)
 
         # We want the new json to live with the jail
         plugin_name = self.plugin.rsplit('_', 1)[0]

iocage_lib/iocage.py

@@ -1751,24 +1751,11 @@ def start(self, jail=None, ignore_exception=False, used_ports=None):
             uuid, path = self.__check_jail_existence__()
             conf = ioc_json.IOCJson(path, silent=self.silent).json_get_value(
                 'all')
-            host_release = float(os.uname()[2].rsplit("-", 1)[0].rsplit("-",
-                                                                        1)[0])
             release = conf["release"]
 
             if release != "EMPTY":
                 release = float(release.rsplit("-", 1)[0].rsplit("-", 1)[0])
-
-                if host_release < release:
-                    ioc_common.logit(
-                        {
-                            "level":
-                            "EXCEPTION",
-                            "message":
-                            f"\nHost: {host_release} is not greater than"
-                            f" jail: {release}\nThis is unsupported."
-                        },
-                        _callback=self.callback,
-                        silent=self.silent)
+                ioc_common.check_release_newer(release, major_only=True)
 
             err, msg = self.__check_jail_type__(conf["type"], uuid)
             depends = conf["depends"].split()
@@ -1987,20 +1974,8 @@ def upgrade(self, release):
             return
 
         if release is not None:
-            host_release = float(os.uname()[2].rsplit("-", 1)[0].rsplit(
-                "-", 1)[0])
             _release = release.rsplit("-", 1)[0].rsplit("-", 1)[0]
-            _release = float(_release)
-
-            if host_release < _release:
-                ioc_common.logit({
-                    "level":
-                    "EXCEPTION",
-                    "message":
-                    f"\nHost: {host_release} is not greater than"
-                    f" target: {_release}\nThis is unsupported."
-                },
-                    _callback=self.callback)
+            ioc_common.check_release_newer(_release, major_only=True)
 
         uuid, path = self.__check_jail_existence__()
         root_path = f"{path}/root"

iocage_lib/release.py

@@ -58,7 +58,9 @@ def __iter__(self):
             for release in filter(
                 lambda r: (
                     r if not self.eol_check else r not in self.eol_list
-                ) and not check_release_newer(r, raise_error=False),
+                ) and not check_release_newer(
+                    r, raise_error=False, major_only=True
+                ),
                 re.findall(
                     r'href="(\d.*RELEASE)/"', req.content.decode('utf-8')
                 )