Simpler yet!

Another suggestion from @william-gr
truenas · Oct 9, 2018 · 3289eed · 3289eed
1 parent 78f8594
commit 3289eed
Showing 1 changed file with 2 additions and 16 deletions.
diff --git a/src/middlewared/middlewared/plugins/jail.py b/src/middlewared/middlewared/plugins/jail.py
@@ -924,22 +924,8 @@ def get_version(self):
         """
         Uses system.version and parses it out for the RELEASE branch we need
         """
-        try:
-            version = self.middleware.call_sync(
-                'cache.get', 'iocage_branch')
-
-            return version
-        except KeyError:
-            freebsd_version = su.run(['freebsd-version'],
-                                     stdout=su.PIPE,
-                                     stderr=su.STDOUT)
-            r = freebsd_version.stdout.decode().rstrip().split('-', 1)[0]
-
-            version = f'{round(float(r.split("-")[0]), 1)}-RELEASE'
-            self.middleware.call_sync(
-                'cache.put', 'iocage_branch', version,
-                604800
-            )
+        r = os.uname().release
+        version = f'{round(float(r.split("-")[0]), 1)}-RELEASE'
 
         return version