prepare v1.3.3

Instead emit warning about the need to log out and log in again

bin/sau

@@ -115,6 +115,9 @@ def main():
         log.error(f'Upgrade failed: {e}')
         return 1
 
+    if not conf.getboolean('default', 'live_system', fallback=True):
+        return 0
+
     if conf.getboolean('default', 'do_service_restart', fallback=True):
         reboot_recommended = sau.services.restart_services()
 
@@ -124,7 +127,7 @@ def main():
         elif reboot_recommended:
             log.info('Rebooting because service restarts did not close all deleted files')
         if reboot_required or reboot_recommended:
-            fork_and_reboot(report_success=conf.getboolean('default', 'reboot_is_success', Fallback=True))
+            fork_and_reboot(report_success=conf.getboolean('default', 'reboot_is_success', fallback=True))
 
     if reboot_required:
         log.warning("Upgrade was success, but a reboot is required due to a system upgrade")

config.cfg

@@ -12,11 +12,15 @@
 # 1.0.1 -> 1.0.1.1 (3)
 version_sensitivity=1
 
+# Set to no if you're using sau in an environment where running processes
+# shouldn't be touched and reboots shouldn't be done, for example in chroots
+live_system=yes
+
 # sau can reboot on system upgrades (FreeBSD) or if the service restarts does
 # not close all deleted files (any platform)
 do_reboot=no
 
-# Set to 0 to exit with failure code when going for reboot.
+# Set to no to exit with failure code when going for reboot.
 reboot_is_success=yes
 
 # Attempt to do a system upgrade

sau/gentoo.py

@@ -11,12 +11,13 @@ SYSTEMCTL='/usr/bin/systemctl'
 EMERGE_PATH='/usr/bin/emerge'
 EQUERY_PATH='/usr/bin/equery'
 EMAINT_PATH='/usr/sbin/emaint'
+PCLEAN_PATH='/usr/bin/perl-cleaner'
 GRUB_MKCONFIG='/usr/sbin/grub-mkconfig'
 
 # parsing output from eix -Ttnc
-package_re = re.compile('^\[([^\]])\] ([^ ]*) \((.*)\): .*$')
+package_re = re.compile(r'^\[([^\]])\] ([^ ]*) \((.*)\): .*$')
 # parsing version information from substrings of the above
-slot_re = re.compile('^(\(~\))?([^\(]+)(\([^\)]+\))$')
+slot_re = re.compile(r'^(\(~\))?([^\(]+)(\([^\)]+\))$')
 
 def identify_service_from_bin(exe):
     log = logging.getLogger(sau.LOGNAME)
@@ -109,7 +110,69 @@ def _sync_portage():
         for line in err.splitlines():
             log.warning("stderr: {}".format(line))
 
+def is_system_package(atom, eclasses):
+    log = logging.getLogger(sau.LOGNAME)
+    name=re.sub(r'^[<=>]*(.*?)(?:-\d)?(?:::\w+)?$', r'\1', atom)
 
+    # 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
+
+    # libc-packages should be considered system-packages as they generally
+    # requires the system to be restarted. Not sure if there is a better way
+    # 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([
+            x in eclasses for x in [
+                'dist-kernel-utils',
+                '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)
+    test_re = re.compile(r'^\s*inherit\s+')
+    cmd=[ EQUERY_PATH, 'w', name ]
+    ret, out, err = sau.helpers.exec_cmd(cmd)
+    if not ret == 0:
+        log.warning(f'Unable to locate ebuild for {atom}')
+        # better safe than sorry; if we don't know, let's pretend it's a system
+        # package
+        return True
+    path = out.strip()
+    if not os.path.isfile(path):
+        log.warning(f"This path doesn't look lika a path to the ebuild for {name}: {path}")
+        return True
+    with open(path, 'r', encoding='utf-8') as f:
+        for line in f.readlines():
+            if eclasses and eclasses[-1] == '\\':
+                eclasses = eclasses[:-1]
+                eclasses.extend(line.split())
+            if re.search(test_re, line):
+                if re.search(test_re, line):
+                    eclasses.extend(line.split()[1:])
+
+    # Remove revisions from eclasses, hopefully makes it less messy if they get
+    # updated
+    eclasses = [re.sub(r'^(.*?)-r\d+', r'\1', x) for x in eclasses]
+    return eclasses
+
+def get_dependencies(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
 
 
 def pkg_upgrade():
@@ -126,6 +189,7 @@ def pkg_upgrade():
     
     default_version_sens = conf.getint('default', 'version_sensitivity', fallback=1)
 
+    ## Query upgradeable packages
     cmd = [ EMERGE_PATH, '--color', 'n', '-uDNpq', '--with-bdeps=y', '@world' ]
     ret, out, err = sau.helpers.exec_cmd(cmd)
 
@@ -139,6 +203,7 @@ def pkg_upgrade():
 
     do_rebuild = True
     do_grub = False
+    rebuild_packages = {}
     for line in out.splitlines():
         if re.match(ignore_re, line):
             continue
@@ -161,15 +226,26 @@ def pkg_upgrade():
         else:
             log.error('{} -- {} -> {} configured level {} > pkg level {}'.format(name, old, new, sens, common))
             do_rebuild = False
-        if name.startswith('sys-kernel/'):
+
+        nameversion = f'{name}-{new}'
+        eclasses = get_eclasses(nameversion)
+        rebuild_packages[name] = eclasses
+
+    for package,eclasses in rebuild_packages.items():
+        if is_system_package(package, eclasses):
             if do_system_upgrade:
                 do_grub = True
             else:
-                raise sau.errors.UpgradeError(f"Kernel package {name} has an update, but system upgrade is disabled")
+                raise sau.errors.UpgradeError(f"System package {package} has an update, but system upgrade is disabled")
 
     if not do_rebuild:
         raise sau.errors.UpgradeError('Some packages require manual attention, did not upgrade')
 
+    if not rebuild_packages:
+        log.info('No packages to upgrade')
+        return False
+
+    ## Actual upgrade
     cmd = [ EMERGE_PATH, '--color', 'n', '-uDNq', '--with-bdeps=y', '@world' ]
     ret, out, err = sau.helpers.exec_cmd(cmd, timeout=72000)
 
@@ -186,22 +262,113 @@ def pkg_upgrade():
             if line.startswith(' * '):
                 log.warning(line)
 
-    cmd = [ EMERGE_PATH, '--color', 'n', '-q', '@preserved-rebuild' ]
+    # from here on we shouldn't need to rebuild the upgraded packages again
-    ret, out, err = sau.helpers.exec_cmd(cmd, timeout=72000)
+    exclude_list = ' --exclude '.join(rebuild_packages.keys()).split()
 
+    # Rebuild go
+    go_packages = []
+    cmd = None
+    for package,eclasses in rebuild_packages.items():
+        if 'go-module' in eclasses or package == 'dev-lang/go':
+            go_packages.append(package)
+    if 'dev-lang/go' in go_packages:
+        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,
+                '--color', 'n',
+                '-q',
+                '--usepkg-exclude', '*/*'] + 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 '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)
+
+    # 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('preserved-rebuild returned {}'.format(ret))
+        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 preserved-rebuild')
+        raise sau.errors.UpgradeError(f'Error during live-rebuild')
     else:
-        log.info('preserved-rebuild complete')
+        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)
@@ -218,6 +385,26 @@ def pkg_upgrade():
                 if line.startswith(' * '):
                     log.warning(line)
 
+
+    # 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:
+        log.error('preserved-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 preserved-rebuild')
+    else:
+        log.info('preserved-rebuild complete')
+        for line in out.splitlines():
+            if line.startswith(' * '):
+                log.warning(line)
+
+
+    # doing grub reconfig and clean old kernels
     if do_grub and os.path.exists(GRUB_MKCONFIG):
         keep_kernels = conf.getint('default', 'keep_kernels', fallback=4)
         if keep_kernels < 1:

sau/services.py

@@ -141,10 +141,12 @@ def restart_services():
                 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 in ('enabled', 'static'):
+                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
@@ -185,7 +187,7 @@ def restart_services():
         if get_deleted_open_files(proc):
             service = services[proc_name]
             policy = _get_service_restart_policy(service)
-            _warn(policy, '{} still has deleted files open'.format(proc, parent))
+            _warn(policy, f'{proc} still has deleted files open')
             recommend_restart = True
     return recommend_restart
 

setup.py

@@ -5,7 +5,7 @@ from setuptools import setup, find_packages
 
 setup(
         name='sau',
-        version='1.2.0',
+        version='1.3.3',
         description='Tool for auto-updating OS and packages',
         author='Feffe',
         author_email='feffe@fulh.ax',