update-linux 2.0.0__tar.gz → 2.1.1__tar.gz

{update-linux-2.0.0 → update-linux-2.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: update-linux
-Version: 2.0.0
+Version: 2.1.1
 Summary: Update Linux
 Home-page: https://github.com/barry-scott/CLI-tools
 Author: Barry Scott
@@ -27,6 +27,8 @@ If running update-linux on a macOS system it is necessary to flush DNS so that f
 
 This is done with the command `sudo killall -HUP mDNSResponder`.
 
+update-linux will refuse to update the host it is running on.
+
 ## update-linux update process
 
 ```

{update-linux-2.0.0 → update-linux-2.1.1}/README.md

@@ -10,6 +10,8 @@ If running update-linux on a macOS system it is necessary to flush DNS so that f
 
 This is done with the command `sudo killall -HUP mDNSResponder`.
 
+update-linux will refuse to update the host it is running on.
+
 ## update-linux update process
 
 ```

{update-linux-2.0.0 → update-linux-2.1.1}/update_linux/__init__.py

@@ -8,7 +8,7 @@ import tempfile
 import json
 from config_path import ConfigPath
 
-VERSION = '2.0.0'
+VERSION = '2.1.1'
 
 default_json_config_template = u'''{
     "group":
@@ -169,15 +169,20 @@ class UpdateFedora:
 
         if self.opt_help:
             print(
-'''Usage: %s <options> <group>|<host>...
+'''Usage: %(appname)s <options> <group>|<host>...
+
+    %(appname)s version %(version)s
+
     group - read from the JSON config file:
-            %s
+            %(config_file)s
 
         each group is a list of hosts to be updated
 
     host - host to be updated
 
-    options:''' % (appname.name, self.config.readFilePath()))
+    options:''' % {'appname': appname.name
+                  ,'version': VERSION
+                  ,'config_file': self.config.readFilePath()} )
 
             printOptionsHelp( self )
             return 0
@@ -194,7 +199,20 @@ class UpdateFedora:
             print( 'Log directory: %s' % (self.logdir,) )
             return 0
 
-        if len(positional_args) == 0:
+        all_to_exclude = []
+        if self.opt_exclude:
+            all_to_exclude = self.all_groups.get( self.opt_exclude(), self.opt_exclude() )
+
+        for group_or_host in positional_args:
+            if group_or_host in self.all_groups:
+                for host in self.all_groups[ group_or_host ]:
+                    if host not in all_to_exclude:
+                        self.all_hosts.append( host )
+            else:
+                if group_or_host not in all_to_exclude:
+                    self.all_hosts.append( group_or_host )
+
+        if len(self.all_hosts) == 0:
             self.error( '', 'No hosts to update' )
             print('''
 For help:
@@ -202,22 +220,16 @@ For help:
 ''' % (appname.name,))
             return 1
 
-        this_host = socket.gethostname().split('.')[0]
-
         self.summary_log_name = self.logdir / ('update-summary-%s.log' % (self.ts,))
 
         with open( self.summary_log_name, 'a' ) as self.summary_log:
             t = datetime.datetime.now()
             self.header( 'Update summary %s' % (t.strftime( '%Y-%m-%d %H:%M:%S' ),) )
 
-            for group_or_host in positional_args:
-                if group_or_host in self.all_groups:
-                    for host in self.all_groups[ group_or_host ]:
-                        self.all_hosts.append( host )
-                else:
-                    self.all_hosts.append( group_or_host )
-
             for host in self.all_hosts:
+                if host in all_to_exclude:
+                    continue
+
                 self.flushDns()
                 if self.opt_check:
                     self.check( host )
@@ -225,13 +237,13 @@ For help:
                 elif self.opt_install_package() is not None:
                     self.installPackage( host, self.opt_install_package )
 
-                elif self.opt_system_upgrade:
-                    self.systemUpgrade( host, self.opt_system_upgrade )
-
                 else:
-                    if host == this_host:
+                    if self.isThisHost( host ):
                         self.warn( host, 'Refusing to update this host' )
 
+                    elif self.opt_system_upgrade:
+                        self.systemUpgrade( host, self.opt_system_upgrade )
+
                     else:
                         self.update( host )
 
@@ -241,6 +253,23 @@ For help:
 
         return 0
 
+    def isThisHost( self, other_host ):
+        this_host = socket.gethostname()
+        this_info = socket.getaddrinfo( this_host, 'ssh', proto=socket.IPPROTO_TCP )
+        this_addrs = set(info[4][0] for info in this_info) | set(['::1', '127.0.0.1'])
+
+        try:
+            other_info = socket.getaddrinfo( other_host, 'ssh', proto=socket.IPPROTO_TCP )
+        except socket.gaierror as e:
+            self.warn( other_host, str(e) )
+            # return true to prevent update
+            return True
+
+        other_addrs = set(info[4][0] for info in other_info)
+
+        # share any address in common?
+        return len(this_addrs & other_addrs) > 0
+
     def loadConfig( self ):
         self.config = ConfigPath( 'update-linux', 'barrys-emacs.org', '.json' )
         config_file = self.config.readFilePath()
@@ -250,8 +279,8 @@ For help:
         if config_file is None:
             json_config = default_json_config
             self.debug( 'Using default builtin config' )
-            self.info( '', 'Creating default config in %s' )
             config_file = self.config.saveFilePath( True )
+            self.info( '', 'Creating default config in %s' % (config_file,) )
             with open( config_file, 'w' ) as f:
                 f.write( json_config )
 

{update-linux-2.0.0 → update-linux-2.1.1}/update_linux/__main__.py

@@ -3,3 +3,6 @@ import update_linux
 
 def main():
     sys.exit( update_linux.UpdateFedora().main( sys.argv ) )
+
+if __name__ == '__main__':
+    main()

{update-linux-2.0.0 → update-linux-2.1.1}/update_linux.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: update-linux
-Version: 2.0.0
+Version: 2.1.1
 Summary: Update Linux
 Home-page: https://github.com/barry-scott/CLI-tools
 Author: Barry Scott
@@ -27,6 +27,8 @@ If running update-linux on a macOS system it is necessary to flush DNS so that f
 
 This is done with the command `sudo killall -HUP mDNSResponder`.
 
+update-linux will refuse to update the host it is running on.
+
 ## update-linux update process
 
 ```