Fix 'iocage fetch' sorting (iocage#716) (#148)

truenas · Dec 13, 2018 · 350d3e2 · 350d3e2
1 parent 8f7d0e1
commit 350d3e2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/iocage_lib/ioc_common.py b/iocage_lib/ioc_common.py
@@ -358,7 +358,7 @@ def sort_template(template):
     return sort_name(_template) + get_name_sortkey(template[1])
 
 
-def sort_release(releases, split=False):
+def sort_release(releases, split=False, fetch_releases=False):
     """
     Sort the list by RELEASE, if split is true it's expecting full
     datasets.
@@ -373,7 +373,9 @@ def sort_release(releases, split=False):
 
         length = len(releases)
 
-        if length == 9 or length == 10:
+        if fetch_releases:
+            pass
+        elif length == 9 or length == 10:
             # Attempt to split off the -p* stuff.
             try:
                 _release, _patch = releases[5].rsplit("-p", 1)

diff --git a/iocage_lib/ioc_fetch.py b/iocage_lib/ioc_fetch.py
@@ -394,7 +394,8 @@ def fetch_http_release(self, eol, _list=False):
                         _callback=self.callback,
                         silent=self.silent)
 
-                releases = iocage_lib.ioc_common.sort_release(releases)
+                releases = iocage_lib.ioc_common.sort_release(
+                    releases, fetch_releases=True)
 
                 for r in releases:
                     iocage_lib.ioc_common.logit(
@@ -461,11 +462,12 @@ def fetch_http_release(self, eol, _list=False):
                         _callback=self.callback,
                         silent=self.silent)
 
+                releases = iocage_lib.ioc_common.sort_release(
+                    releases, fetch_releases=True)
+
                 if _list:
                     return releases
 
-                releases = iocage_lib.ioc_common.sort_release(releases)
-
                 for r in releases:
                     if r in eol:
                         iocage_lib.ioc_common.logit(