updates: switch script to import

Signed-off-by: Ian Leonard <antonlacon@gmail.com>

Author: antonlacon

resources/lib/modules/updates.py

@@ -23,6 +23,10 @@
 import oeWindows
 import os_tools
 
+if os.path.isfile('/usr/bin/update-system'):
+    from importlib.machinery import SourceFileLoader
+    checker = SourceFileLoader('add', '/usr/bin/update-system').load_module()
+
 
 class updates(modules.Module):
 
@@ -575,28 +579,26 @@ def check_updates_v2(self, force=False):
         log.log(f'URL: {url}', log.DEBUG)
         update_json = oe.load_url(url)
         log.log(f'RESULT: {repr(update_json)}', log.DEBUG)
-        # use system script if available
+        # use system module if available
         if os.path.isfile('/usr/bin/update-system'):
             # Discard server response
             update_json = None
             self.last_update_check = time.time()
-            update_result = os_tools.execute('/usr/bin/update-system --settingsonly', get_result=True).strip()
-            if update_result:
-                log.log(f'update-system result: {update_result}', log.DEBUG)
-                # Bugfix update found. Notify and automatic update if enabled.
-                if update_result.startswith('http://') or update_result.startswith('https://'):
-                    log.log(f'Found update: {update_result}', log.INFO)
-                    self.update_file, self.update_checksum = update_result.split(' ')
-                    if self.struct['update']['settings']['UpdateNotify']['value'] == '1':
-                        oe.notify(oe._(32363), oe._(32364))
-                    if self.struct['update']['settings']['AutoUpdate']['value'] == 'auto' and force == False:
-                        self.update_in_progress = True
-                        self.do_autoupdate(None, True)
-                # Major update found. Notify if enabled but no automatic update.
-                elif update_result == 'True':
-                    log.log('Major update found.', log.DEBUG)
-                    if self.struct['update']['settings']['UpdateNotify']['value'] == '1':
-                        oe.notify(oe._(32363), oe._(32364))
+            update_found, update_major, update_url, update_checksum = checker.check_for_update()
+            if update_found:
+                if update_url:
+                    log.log(f'Found update: {update_url}', log.INFO)
+                    self.update_file = update_url
+                if update_checksum:
+                    log.log(f'JSON Update checksum: {update_checksum}', log.DEBUG)
+                    self.update_checksum = update_checksum
+                # on screen notification
+                if self.struct['update']['settings']['UpdateNotify']['value'] == '1':
+                    oe.notify(oe._(32363), oe._(32364))
+                # automatic update if enabled and not a major release
+                if not update_major and (self.struct['update']['settings']['AutoUpdate']['value'] == 'auto' and force is False):
+                    self.update_in_progress = True
+                    self.do_autoupdate(None, True)
             else:
                 log.log('No update found.', log.DEBUG)
         # fallback to server update check