update-linux 3.1.0__tar.gz → 3.2.0__tar.gz

{update-linux-3.1.0 → update_linux-3.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: update-linux
-Version: 3.1.0
+Version: 3.2.0
 Summary: Command to automate the routine updating of packages and system upgrading for Unix systems.
 Author-email: Barry Scott <barry@barrys-emacs.org>
 License: Apache-2.0

{update-linux-3.1.0 → update_linux-3.2.0}/pyproject.toml

@@ -9,7 +9,7 @@ authors = [
 ]
 description = "Command to automate the routine updating of packages and system upgrading for Unix systems."
 readme = "README.md"
-requires-python = ">=3.10"
+requires-python = ">= 3.10"
 license = {text = "Apache-2.0"}
 keywords = [ "development" ]
 classifiers = [

{update-linux-3.1.0 → update_linux-3.2.0}/src/update_linux/__init__.py

@@ -9,7 +9,7 @@ import tempfile
 import json
 from config_path import ConfigPath  # type: ignore
 
-VERSION = '3.1.0'
+VERSION = '3.2.0'
 
 default_json_config_template = u'''{
     "group":
@@ -418,11 +418,22 @@ For help:
     def reboot( self, host, cmd, wait_limit=600 ):
         while True:
             rc, stdout = self.runAndLog( host, cmd )
-            if len(stdout) == 0:
+            # filter out warning/info messages before checking for success
+            filtered_stdout = []
+            for line in stdout:
+                if line.startswith(
+                        ('Warning: '
+                        ,'Offending key for '
+                        ,'Matching host key in ')):
+                    continue
+                filtered_stdout.append(line)
+
+            if len(filtered_stdout) == 0:
                 # no messages assume ok
                 break
 
-            if stdout[0] == ('Connection to %s closed by remote host.\r\n' % (host,)):
+            if( filtered_stdout[0].startswith('Connection to ')
+            and filtered_stdout[0].endswith('closed by remote host.\r\n') ):
                 # this is success
                 break
 
@@ -587,7 +598,7 @@ class UpdatePluginFedora:
 
         self.app.info( host, 'Starting Update' )
 
-        cmd = ['dnf', '-vy', 'update', '--refresh']
+        cmd = ['dnf', '-y', 'update', '--refresh']
         rc, stdout = self.app.runAndLog( host, cmd )
 
         self.app.writeLines( update_log_name, stdout )
@@ -662,7 +673,15 @@ class UpdatePluginFedora:
 
     def releaseInfo( self, host ):
         cmd = ['cat', '/etc/system-release-cpe']
-        rc, stdout = self.app.runAndLog( host, cmd, log=False )
+        # first boot after a system upgrade seen to block this access
+        log = False
+        for _ in range(10):
+            rc, stdout = self.app.runAndLog( host, cmd, log=log )
+            if 'System is booting up' not in stdout[0]:
+                break
+            log = True
+            time.sleep(5)
+
         cpe_parts = stdout[0].strip().split( ':' )
         if len(cpe_parts) >= 4:
             return int( cpe_parts[4] )

{update-linux-3.1.0 → update_linux-3.2.0}/src/update_linux.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: update-linux
-Version: 3.1.0
+Version: 3.2.0
 Summary: Command to automate the routine updating of packages and system upgrading for Unix systems.
 Author-email: Barry Scott <barry@barrys-emacs.org>
 License: Apache-2.0