bin/sau

@@ -115,7 +115,7 @@ def main():
         log.error(f'Upgrade failed: {e}')
         return 1
 
-    if not conf.getboolean('default', 'live_system', fallback=True):
+    if not conf.getboolean('default', 'live_system', True):
         return 0
 
     if conf.getboolean('default', 'do_service_restart', fallback=True):

config.cfg

@@ -45,11 +45,6 @@ do_depclean=yes
 # do eix-sync on Gentoo
 do_reposync=yes
 
-# do live-rebuild, go-rebuild, rust-rebuild, perl-cleaner etc. on Gentoo
-# set to no if using binary packages that are bumped when needed.
-# Leave as yes on package builders and if not using binary packages.
-do_rebuilds=yes
-
 # to only write to stderr when something unexpected happens or manual action is required
 # set stderr_loglevel to warning
 stderr_loglevel=debug

sau/gentoo.py

@@ -4,7 +4,6 @@ import re
 
 import sau
 import sau.helpers
-import sau.services
 
 EIX_SYNC_PATH='/usr/bin/eix-sync'
 RC_SERVICE_PATH='/sbin/rc-service'
@@ -23,10 +22,11 @@ slot_re = re.compile(r'^(\(~\))?([^\(]+)(\([^\)]+\))$')
 def identify_service_from_bin(exe):
     log = logging.getLogger(sau.LOGNAME)
 
-    if sau.services.on_systemd():
+    with open('/proc/1/comm', 'r') as f:
-        init_script_re = re.compile(r'[^/]*(.*)\.service$')
+        if f.readline().strip() == 'systemd':
-    else:
+            init_script_re = re.compile(r'[^/]*(.*)\.service$')
-        init_script_re = re.compile(r'/etc/init\.d/(.*)')
+        else:
+            init_script_re = re.compile(r'/etc/init\.d/(.*)')
 
     cmd = [ EQUERY_PATH, '-Cq', 'b', exe ]
     ret, out, err = sau.helpers.exec_cmd(cmd)
@@ -61,10 +61,11 @@ def identify_service_from_bin(exe):
 
 def restart_service(service):
     log = logging.getLogger(sau.LOGNAME)
-    if sau.services.on_systemd():
+    with open('/proc/1/comm', 'r') as f:
-        cmd = [ SYSTEMCTL, 'restart', service ]
+        if f.readline().strip() == 'systemd':
-    else:
+            cmd = [ SYSTEMCTL, 'restart', service ]
-        cmd = [ RC_SERVICE_PATH, service, 'restart' ]
+        else:
+            cmd = [ RC_SERVICE_PATH, service, 'restart' ]
     ret, out, err = sau.helpers.exec_cmd(cmd)
 
     if ret != 0:
@@ -116,10 +117,6 @@ def is_system_package(atom, eclasses):
     # sys-boot/ category should probably always be considered
     # system-packages
     if name.split('/')[0] == 'sys-boot':
-        log.debug(f"{name} is a sys-boot package")
-        return True
-
-    if eclasses is True:
         return True
 
     # libc-packages should be considered system-packages as they generally
@@ -127,7 +124,6 @@ def is_system_package(atom, eclasses):
     # then just checking for specific packages here, but as far as I know there
     # are not many of them anyway...
     if re.search(r'^sys-libs/(glibc|musl)', name):
-        log.debug(f"{name} is a libc package")
         return True
 
     if any([
@@ -136,14 +132,13 @@ def is_system_package(atom, eclasses):
                 'linux-mod',
                 'kernel-install' ]
             ]):
-        log.debug(f"{name} is of system eclass (eclasses: {eclasses})")
         return True
     return False
 
 def get_eclasses(atom):
     log = logging.getLogger(sau.LOGNAME)
     eclasses = []
-    name=re.sub(r'^[<=>]*(.*?)(?:-\d+)?(?:::\w+)?$', r'\1', atom)
+    name=re.sub(r'^[<=>]*(.*?)(?:-\d)?(?:::\w+)?$', r'\1', atom)
     test_re = re.compile(r'^\s*inherit\s+')
     cmd=[ EQUERY_PATH, 'w', name ]
     ret, out, err = sau.helpers.exec_cmd(cmd)
@@ -171,7 +166,7 @@ def get_eclasses(atom):
     return eclasses
 
 def get_dependencies(atom):
-    cmd=[ EQUERY_PATH, '-q', 'd', '-F', '$cp', atom ]
+    cmd=[ EQUERY_PATH, '-q', 'd', '-F', '$cp', name ]
     ret, out, err = sau.helpers.exec_cmd(cmd)
     dependencies = [l.strip() for l in out.splitlines()]
     return dependencies
@@ -238,7 +233,7 @@ def pkg_upgrade():
             if do_system_upgrade:
                 do_grub = True
             else:
-                raise sau.errors.UpgradeError(f"System package {package} has an update, but system upgrade is disabled")
+                raise sau.errors.UpgradeError(f"System package {name} has an update, but system upgrade is disabled")
 
     if not do_rebuild:
         raise sau.errors.UpgradeError('Some packages require manual attention, did not upgrade')
@@ -264,116 +259,113 @@ def pkg_upgrade():
             if line.startswith(' * '):
                 log.warning(line)
 
-    ## rebuild as needed
+    # from here on we shouldn't need to rebuild the upgraded packages again
-    do_rebuild = conf.getboolean('default', 'do_rebuilds', fallback=True)
+    exclude_list = '--exclude '.join(rebuild_packages.keys()).split()
-    if do_rebuild:
-        # from here on we shouldn't need to rebuild the upgraded packages again
-        exclude_list = ' --exclude '.join(rebuild_packages.keys()).split()
 
-        # Rebuild go
+    # Rebuild go
-        go_packages = []
+    go_packages = []
-        cmd = None
+    cmd = None
-        for package,eclasses in rebuild_packages.items():
+    for package,eclasses in rebuild_packages.items():
-            if 'go-module' in eclasses or package == 'dev-lang/go':
+        if 'go-module' in eclasses or package == 'dev-lang/go':
-                go_packages.append(package)
+            go_packages.append(package)
-        if 'dev-lang/go' in go_packages:
+    if 'dev-lang/go' in go_packages:
-            log.info("Running golang-rebuild due to update of dev-lang/go")
+        log.info("Running golang-rebuild due to update of dev-lang/go")
+        cmd = [
+                EMERGE_PATH,
+                '--color', 'n',
+                '-q',
+                '--usepkg-exclude', '*/*',
+                '@golang-rebuild',
+                '--exclude' ] + exclude_list
+    elif go_packages:
+        dependencies = []
+        for package in go_packages:
+            dependencies.append(get_dependencies(package))
+        dependencies = set(dependencies)
+        upgraded = set(rebuild_packages.keys())
+        not_upgraded = dependencies-upgraded
+        if not_upgraded:
+            log.info(f'Rebuilding packages dependant of go modules {", ".join(go_packages)}')
             cmd = [
-                    EMERGE_PATH,
+                EMERGE_PATH,
-                    '--color', 'n',
+                '--color', 'n',
-                    '-q',
+                '-q',
-                    '--usepkg', 'n',
+                '--usepkg-exclude', '*/*'] + not_upgraded
-                    '@golang-rebuild',
+    if cmd:
-                    '--exclude' ] + exclude_list
+        ret, out, err = sau.helpers.exec_cmd(cmd, timeout=72000)
-        elif go_packages:
-            dependencies = []
-            for package in go_packages:
-                dependencies.extend(get_dependencies(package))
-            dependencies = set(dependencies)
-            upgraded = set(rebuild_packages.keys())
-            not_upgraded = dependencies-upgraded
-            if not_upgraded:
-                log.info(f'Rebuilding packages dependant of go modules {", ".join(go_packages)}')
-                cmd = [
-                    EMERGE_PATH,
-                    '--color', 'n',
-                    '-q',
-                    '--usepkg', 'n'] + not_upgraded
-        if cmd:
-            ret, out, err = sau.helpers.exec_cmd(cmd, timeout=72000)
-            if ret != 0 or err:
-                log.error('Rebuild of go packages returned {}'.format(ret))
-                for line in out.splitlines():
-                    log.error('stdout: {}'.format(line))
-                for line in err.splitlines():
-                    log.error('stderr: {}'.format(line))
-                raise sau.errors.UpgradeError(f'Error during go rebuild')
-            else:
-                log.info('go rebuild complete')
-                for line in out.splitlines():
-                    if line.startswith(' * '):
-                        log.warning(line)
-
-        # rebuild rust
-        if any([x in rebuild_packages for x in ('dev-lang/rust', 'dev-lang/rust-bin')]):
-            log.info("Running rust-rebuild due to update of rust")
-            cmd = [
-                    EMERGE_PATH,
-                    '--color', 'n',
-                    '-q',
-                    '--usepkg', 'n',
-                    '@rust-rebuild',
-                    '--exclude' ] + exclude_list
-            ret, out, err = sau.helpers.exec_cmd(cmd, timeout=72000)
-            if ret != 0 or err:
-                log.error('Rebuild of rust packages returned {}'.format(ret))
-                for line in out.splitlines():
-                    log.error('stdout: {}'.format(line))
-                for line in err.splitlines():
-                    log.error('stderr: {}'.format(line))
-                raise sau.errors.UpgradeError(f'Error during rust rebuild')
-            else:
-                log.info('rust rebuild complete')
-                for line in out.splitlines():
-                    if line.startswith(' * '):
-                        log.warning(line)
-
-        # run perl-cleaner
-        if 'dev-lang/perl' in rebuild_packages:
-            log.info("Running perl-cleaner due to perl upgrade")
-            cmd = [ PCLEAN_PATH, '--all', '--', '-q', '--usepkg', 'n']
-            ret, out, err = sau.helpers.exec_cmd(cmd, timeout=72000)
-            if ret != 0 or err:
-                log.error('perl-cleaner failed with code {}'.format(ret))
-                for line in out.splitlines():
-                    log.error('stdout: {}'.format(line))
-                for line in err.splitlines():
-                    log.error('stderr: {}'.format(line))
-                raise sau.errors.UpgradeError(f'Error during perl-cleaner')
-            else:
-                log.info('perl-cleaner complete')
-                for line in out.splitlines():
-                    if line.startswith(' * '):
-                        log.warning(line)
-
-        # rebuild live packages
-        cmd = [ EMERGE_PATH, '--color', 'n', '-q', '--usepkg', 'n', '@live-rebuild' ]
-        ret, out, err = sau.helpers.exec_cmd(cmd, timeout=3600)
         if ret != 0 or err:
-            log.error('live-rebuild returned {}'.format(ret))
+            log.error('Rebuild of go packages returned {}'.format(ret))
             for line in out.splitlines():
                 log.error('stdout: {}'.format(line))
             for line in err.splitlines():
                 log.error('stderr: {}'.format(line))
-            raise sau.errors.UpgradeError(f'Error during live-rebuild')
+            raise sau.errors.UpgradeError(f'Error during go rebuild')
         else:
-            log.info('live-rebuild complete')
+            log.info('go rebuild complete')
             for line in out.splitlines():
                 if line.startswith(' * '):
                     log.warning(line)
 
+    # rebuild rust
+    if 'dev-lang/rust' in rebuild_packages:
+        log.info("Running rust-rebuild due to update of dev-lang/rust")
+        cmd = [
+                EMERGE_PATH,
+                '--color', 'n',
+                '-q',
+                '--usepkg-exclude', '*/*',
+                '@rust-rebuild',
+                '--exclude' ] + exclude_list
+        ret, out, err = sau.helpers.exec_cmd(cmd, timeout=72000)
+        if ret != 0 or err:
+            log.error('Rebuild of rust packages returned {}'.format(ret))
+            for line in out.splitlines():
+                log.error('stdout: {}'.format(line))
+            for line in err.splitlines():
+                log.error('stderr: {}'.format(line))
+            raise sau.errors.UpgradeError(f'Error during rust rebuild')
+        else:
+            log.info('rust rebuild complete')
+            for line in out.splitlines():
+                if line.startswith(' * '):
+                    log.warning(line)
 
-    ## Depclean
+    # run perl-cleaner
+    if 'dev-lang/perl' in rebuild_packages:
+        log.info("Running perl-cleaner due to perl upgrade")
+        cmd = [ PCLEAN_PATH, '--all', '--', '-q', '--usepkg-exclude', '*/*']
+        ret, out, err = sau.helpers.exec_cmd(cmd, timeout=72000)
+        if ret != 0 or err:
+            log.error('perl-cleaner failed with code {}'.format(ret))
+            for line in out.splitlines():
+                log.error('stdout: {}'.format(line))
+            for line in err.splitlines():
+                log.error('stderr: {}'.format(line))
+            raise sau.errors.UpgradeError(f'Error during perl-cleaner')
+        else:
+            log.info('perl-cleaner complete')
+            for line in out.splitlines():
+                if line.startswith(' * '):
+                    log.warning(line)
+
+    # rebuild live packages
+    cmd = [ EMERGE_PATH, '--color', 'n', '-q', '--usepkg-exclude', '*/*', '@live-rebuild' ]
+    ret, out, err = sau.helpers.exec_cmd(cmd, timeout=3600)
+    if ret != 0 or err:
+        log.error('live-rebuild returned {}'.format(ret))
+        for line in out.splitlines():
+            log.error('stdout: {}'.format(line))
+        for line in err.splitlines():
+            log.error('stderr: {}'.format(line))
+        raise sau.errors.UpgradeError(f'Error during live-rebuild')
+    else:
+        log.info('live-rebuild complete')
+        for line in out.splitlines():
+            if line.startswith(' * '):
+                log.warning(line)
+
+
+    # Depclean
     if conf.getboolean('default', 'do_depclean', fallback=False):
         cmd = [ EMERGE_PATH, '--color', 'n', '-q', '--depclean' ]
         ret, out, err = sau.helpers.exec_cmd(cmd, timeout=3600)
@@ -391,8 +383,8 @@ def pkg_upgrade():
                     log.warning(line)
 
 
-    ## Preserved rebuild
+    # Preserved rebuild
-    cmd = [ EMERGE_PATH, '--color', 'n', '--usepkg', 'n', '-q', '@preserved-rebuild' ]
+    cmd = [ EMERGE_PATH, '--color', 'n', '-q', '@preserved-rebuild' ]
     ret, out, err = sau.helpers.exec_cmd(cmd, timeout=72000)
 
     if ret != 0 or err:

sau/services.py

@@ -10,10 +10,7 @@ import sau.errors
 import sau.helpers
 import sau.platforms
 
-proc_fd_map_re = re.compile(r'^.*(/(?:usr|lib|opt|etc|s?bin)[^\(]*) \(deleted\)$')
+proc_fd_map_re = re.compile(r'^.*(/[^\(]*) \(deleted\)$')
-
-valid_service_policies=('restart', 'warn', 'ignore', 'silent-restart',
-                        'reboot', 'silent-reboot')
 
 def _warn(policy, msg):
     log = logging.getLogger(sau.LOGNAME)
@@ -31,8 +28,7 @@ def get_deleted_open_files(proc):
             for line in f:
                 match = re.match(proc_fd_map_re, line)
                 if match:
-                    fname = match.group(1)
+                    files.add(match.group(1))
-                    files.add(fname)
         return files
 
     # on FreeBSD psutils open_files() helpfully returns a null path if a file
@@ -79,16 +75,6 @@ def _get_processes():
 
     return check_procs
 
-# Just return True if system is running on systemd
-def on_systemd():
-    try:
-        init_proc = psutil.Process(pid=1)
-        if init_proc.name() == 'systemd':
-            return True
-    except psutil.NoSuchProcess:
-        pass
-    return False
-
 def restart_services():
     log = logging.getLogger(sau.LOGNAME)
     platform = sau.platforms.get_platform()
@@ -98,6 +84,14 @@ def restart_services():
     # wait before the second test
     time.sleep(5)
 
+    on_systemd = False
+    try:
+        init_proc = psutil.Process(pid=1)
+        if init_proc.name() == 'systemd':
+            on_systemd = True
+    except psutil.NoSuchProcess:
+        pass
+
     # perform a second check to remove potential false positives
     service_procs = set()
     retest_procs = set()
@@ -111,7 +105,7 @@ def restart_services():
         except (psutil.NoSuchProcess, psutil.ZombieProcess, psutil.AccessDenied):
             # either of the above exceptions means the process has quit
             continue
-        if on_systemd():
+        if on_systemd:
             service_procs.add(proc)
         else:
             parent = _get_top_parent(proc)
@@ -120,6 +114,7 @@ def restart_services():
         retest_procs.add(proc)
 
     recommend_restart = False
+    processes = {}
     services = {}
     for proc in service_procs:
         if not proc:
@@ -133,28 +128,43 @@ def restart_services():
             log.debug('{} died before it could be restarted'.format(proc))
             continue
 
-        service_name = _get_service_from_proc(proc)
+        if on_systemd:
+            if proc.pid == 1:
+                log.info("Upgrade of systemd detected; doing daemon-reexec")
+                ret, _out, _err = sau.helpers.exec_cmd([ '/usr/bin/systemctl', 'daemon-reexec' ])
+                continue
+            ret, unit, err = sau.helpers.exec_cmd([ '/usr/bin/systemctl', 'whoami', f'{proc.pid}' ])
+            unit = unit.strip()
+            name, unit_type = unit.split('.')
+            if ret != 0:
+                log.debug(f'Non-success ({ret}) when checking unit for process: {err}')
+                continue
+            elif unit_type != 'service':
+                log.warning(f'not restarting non-service unit "{unit}"; owner of {proc}')
+            elif name.startswith('user@'):
+                log.warning(f'Not restarting user service {unit}; please log out and log in again')
+            else:
+                _ret, enabled, _err = sau.helpers.exec_cmd([ '/usr/bin/systemctl', 'is-enabled', unit ])
+                enabled = enabled.strip()
+                if enabled not in ('enabled', 'static'):
+                    log.warning(f'Unit {name}.service has enable status: {enabled} - will only restart "enabled" services')
+                else:
+                    service_name = name
+        else:
+            service_name = _get_service_from_proc(proc)
 
         if not service_name:
             log.warning('no service for process {}'.format(proc))
             recommend_restart = True
             continue
-        if service_name == 'systemd':
-            log.info("Upgrade of systemd detected; doing daemon-reexec")
-            sau.helpers.exec_cmd([ '/usr/bin/systemctl', 'daemon-reexec' ])
-            continue
-        elif service_name == '@ignore':
-            log.info(f"Process {proc} ignored by configuration")
-            retest_procs.discard(proc)
-            continue
 
         services[proc_name] = service_name
+        processes[service_name] = [proc]
 
     for service in set([x for x in services.values() if x]):
         policy = _get_service_restart_policy(service)
         if policy == 'ignore':
             log.info('Service "{}" ignored by configuration'.format(service))
-            [retest_procs.discard(x) for x,y in services.items() if y == service]
             continue
         elif policy == 'warn':
             log.warning('Service "{}" has open deleted files and should be restarted'.format(service))
@@ -185,7 +195,7 @@ def _get_service_restart_policy(service):
     log = logging.getLogger(sau.LOGNAME)
     conf = sau.config
     policy = conf.get('services', service, fallback=None)
-    if policy and policy.lower() in valid_service_policies:
+    if policy and policy.lower() in ('restart', 'warn', 'ignore', 'silent-restart', 'reboot', 'silent-reboot'):
         return policy.lower()
     elif policy:
         log.warning('service policy {} for {} is invalid'.format(policy, service))
@@ -199,53 +209,21 @@ def _get_service_restart_policy(service):
 def _get_service_from_proc(proc):
     conf = sau.config
     platform = sau.platforms.get_platform()
-    if not on_systemd():
+    proc = _get_top_parent(proc)
-        proc = _get_top_parent(proc)
     log = logging.getLogger(sau.LOGNAME)
     try:
         proc_name = proc.name()
         service_exe = proc.exe()
     except (psutil.NoSuchProcess, psutil.ZombieProcess, psutil.AccessDenied):
         log.debug('{} died'.format(proc))
-        return '@ignore'
+        return None
 
     service_name = conf.get('processes', proc_name, fallback=None)
-    log.debug(f'configuration of process "{proc_name}" in config: "{service_name}"')
     if service_name == '':
         log.debug('Ignoring process {}'.format(proc))
-        return '@ignore'
+        return None
 
     if not service_name:
-        # Systemd has it's own way...
-        if on_systemd():
-            if proc.pid == 1:
-                return 'systemd'
-            ret, unit, err = sau.helpers.exec_cmd([ '/usr/bin/systemctl', 'whoami', f'{proc.pid}' ])
-            unit = unit.strip()
-            name, unit_type = unit.split('.')
-            if ret != 0:
-                log.debug(f'Non-success ({ret}) when checking unit for process: {err}')
-                return None
-            elif unit_type != 'service':
-                log.warning(f'not restarting non-service unit "{unit}"; owner of {proc}')
-                return None
-            elif name.startswith('user@'):
-                log.warning(f'Not restarting user service {unit}; please log out and log in again')
-                return None
-            else:
-                policy = conf.get('services', name, fallback=None)
-                if policy and policy.lower() in valid_service_policies:
-                    return name
-                _ret, enabled, _err = sau.helpers.exec_cmd([ '/usr/bin/systemctl', 'is-enabled', unit ])
-                enabled = enabled.strip()
-                if enabled not in ('enabled', 'static'):
-                    log.warning(f'Unit {name}.service has enable status: {enabled} - will only restart "enabled" services')
-                    return None
-                else:
-                    return name
-            log.error(f'This should be an unreachable path when checking process {proc}')
-            return None
-
         # if the exe file has been deleted since started, service_exe will be empty
         # and we'll have to guess
         if not service_exe:

setup.py

@@ -1,11 +1,11 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3.7
 from os import environ
 
 from setuptools import setup, find_packages
 
 setup(
         name='sau',
-        version='1.4.5',
+        version='1.3.1',
         description='Tool for auto-updating OS and packages',
         author='Feffe',
         author_email='feffe@fulh.ax',