update-linux 3.5.1__tar.gz → 3.5.3__tar.gz

{update_linux-3.5.1 → update_linux-3.5.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: update-linux
-Version: 3.5.1
+Version: 3.5.3
 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.5.1 → update_linux-3.5.3}/src/update_linux/__init__.py

@@ -9,7 +9,7 @@ import tempfile
 import json
 from config_path import ConfigPath  # type: ignore
 
-VERSION = '3.5.1'
+VERSION = '3.5.3'
 
 default_json_config_template = u'''{
     "group":
@@ -257,6 +257,8 @@ For help:
                 if host in all_to_exclude:
                     continue
 
+                self.flushDns()
+
                 os_plugin_type, os_id, os_version = self.detectOperatingSystem( host )
                 if os_plugin_type is None:
                     if os_id is not None:
@@ -267,7 +269,6 @@ For help:
 
                 plugin = os_id_to_plugin[ os_plugin_type ]( self )
 
-                self.flushDns()
                 if self.opt_check:
                     plugin.check( host,
                         check_log_name=self.logdir / ('check-update-%s-%s.log' % (host or 'localhost', self.ts)) )
@@ -383,7 +384,6 @@ For help:
         cmd = ['killall', '-HUP', 'mDNSResponder']
         self.runAndLog( None, cmd, log=False )
 
-
     def detectOperatingSystem( self, host ):
         if host is not None:
             rc = ssh_wait( host, wait=False, log_fn=None )
@@ -671,30 +671,32 @@ class UpdatePluginFedora:
                     self.app.checkServices( host, status_log_name )
 
     def systemUpgrade( self, host, target_release, upgrade_log_name ):
-        current_release = self.releaseInfo( host )
-        if current_release >= target_release:
-            self.app.info( host, 'Already running release %d' % (current_release,) )
-            return
+        while True:
+            current_release = self.releaseInfo( host )
+            if current_release >= target_release:
+                self.app.info( host, 'Already running release %d' % (current_release,) )
+                return
 
-        self.app.info( host, 'Currently release %d' % (current_release,) )
+            self.app.info( host, 'Currently release %d' % (current_release,) )
 
-        # only update by one release at a time
-        next_release = current_release + 1
+            # only update by one release at a time
+            next_release = current_release + 1
 
-        cmd = ['dnf', 'system-upgrade', 'download', '--releasever=%d' % (next_release,), '--assumeyes']
-        rc, stdout = self.app.runAndLog( host, cmd )
-        self.app.writeLines( upgrade_log_name, stdout )
+            cmd = ['dnf', 'system-upgrade', 'download', '--releasever=%d' % (next_release,), '--assumeyes']
+            rc, stdout = self.app.runAndLog( host, cmd )
+            self.app.writeLines( upgrade_log_name, stdout )
 
-        if rc != 0:
-            self.app.error( host, 'Failure to download release %d' % (next_release,) )
-            return
+            if rc != 0:
+                self.app.error( host, 'Failure to download release %d' % (next_release,) )
+                return
 
-        self.app.info( host, 'Rebooting to install system-upgrade' )
-        # upgrades of lots of packages can be slow - wait for 45 minutes
-        if self.app.reboot( host, ['dnf', 'system-upgrade', 'reboot', '--assumeyes'], wait_limit=45*60 ):
-            self.app.checkServices( host, upgrade_log_name )
+            self.app.info( host, 'Rebooting to install system-upgrade' )
+            # upgrades of lots of packages can be slow - wait for 45 minutes
+            if self.app.reboot( host, ['dnf', 'system-upgrade', 'reboot', '--assumeyes'], wait_limit=45*60 ):
+                if not self.app.checkServices( host, upgrade_log_name ):
+                    return
 
-        self.app.info( host, 'Now running release %d' % (self.releaseInfo( host ),) )
+            self.app.info( host, 'Now running release %d' % (self.releaseInfo( host ),) )
 
     def releaseInfo( self, host ):
         cmd = ['cat', '/etc/system-release-cpe']

{update_linux-3.5.1 → update_linux-3.5.3}/src/update_linux.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: update-linux
-Version: 3.5.1
+Version: 3.5.3
 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