report error instead of warning when a package prevent upgrade

bin/sau

@@ -8,6 +8,7 @@ import sys
 import time
 
 import sau
+import sau.errors
 import sau.services
 import sau.platforms
 
@@ -46,6 +47,12 @@ def init():
 
 def fork_and_reboot():
     log = logging.getLogger(sau.LOGNAME)
+    if os.path.exists('/proc/1/comm'):
+        with open('/proc/1/comm', 'r') as f:
+            if f.readline().strip() == 'systemd':
+                os.execl('/usr/bin/systemctl', 'reboot')
+                log.error("Failed to execl?")
+                sys.exit(1)
     try:
         pid = os.fork()
         if pid != 0:
@@ -95,11 +102,15 @@ def main():
     reboot_required = False
     reboot_recommended = False
 
+    try:
         if conf.getboolean('default', 'do_system_upgrade', fallback=True):
             reboot_required = platform.system_upgrade()
 
         if conf.getboolean('default', 'do_package_upgrade', fallback=True):
-        platform.pkg_upgrade()
+            reboot_required = reboot_required or platform.pkg_upgrade()
+    except sau.errors.UpgradeError as e:
+        log.error(f'Upgrade failed: {e}')
+        return 1
 
     if conf.getboolean('default', 'do_service_restart', fallback=True):
         reboot_recommended = sau.services.restart_services()
@@ -112,6 +123,7 @@ def main():
         if reboot_required or reboot_recommended:
             fork_and_reboot()
 
+
 def _conf_level_to_logging_level(conf_level):
     if conf_level.lower() == 'debug':
         return logging.DEBUG

config.cfg

@@ -16,9 +16,14 @@ version_sensitivity=1
 # not close all deleted files (any platform)
 do_reboot=no
 
-# FreeBSD system update (freebsd-update fetch install, not freebsd-update upgrade)
+# Attempt to do a system upgrade
+# FreeBSD: upgrade to latest patch version using freebsd-update fetch install
+# Gentoo: allow upgrade of sys-kernel/-packages, clean old kernels, and update grub-config
 do_system_upgrade=yes
 
+# On Gentoo kernel upgrades, remove all but the last keep_kernels kernels from /boot
+keep_kernels=4
+
 # upgrade packages
 do_package_upgrade=yes
 
@@ -44,12 +49,10 @@ syslog_loglevel=info
 # platform
 [packages]
 # Gentoo uses the category/package naming scheme
-dev-db/postgresql=2
+dev-db/postgresql=1
 
-# Gentoo kernel stuff should be updated manually
+# It's safer to upgrade zfs manually
-sys-kernel/gentoo-sources=-1
+sys-fs/zfs-kmod=99
-sys-kernel/spl=-1
-sys-fs/zfs-kmod=-1
 
 # FreeBSD uses the short package name (without category)
 gitlab=2

sau/__init__.py

@@ -1,2 +1 @@
-
 LOGNAME="sau"

sau/errors.py

@@ -5,3 +5,5 @@ class PlatformNotSupported(Exception):
 class UnknownServiceError(Exception):
     pass
 
+class UpgradeError(Exception):
+    pass

sau/freebsd.py

@@ -132,5 +132,14 @@ def pkg_upgrade():
         for line in err.splitlines():
             log.warning('stderr: {}'.format(line))
 
+    if conf.getboolean('default', 'do_depclean', fallback=False):
+        cmd = [ PKG_PATH, 'autoremove', '-yq' ]
+        ret, out, err = sau.helpers.exec_cmd(cmd, timeout=3600)
+        if ret != 0 or err:
+            log.warning('{} failed:'.format(' '.join(cmd)))
+            for line in out.splitlines():
+                log.warning('stdout: {}'.format(line))
+            for line in err.splitlines():
+                log.warning('stderr: {}'.format(line))
     return True
 

sau/gentoo.py

@@ -7,8 +7,11 @@ import sau.helpers
 
 EIX_SYNC_PATH='/usr/bin/eix-sync'
 RC_SERVICE_PATH='/sbin/rc-service'
+SYSTEMCTL='/usr/bin/systemctl'
 EMERGE_PATH='/usr/bin/emerge'
 EQUERY_PATH='/usr/bin/equery'
+EMAINT_PATH='/usr/sbin/emaint'
+GRUB_MKCONFIG='/usr/sbin/grub-mkconfig'
 
 # parsing output from eix -Ttnc
 package_re = re.compile('^\[([^\]])\] ([^ ]*) \((.*)\): .*$')
@@ -18,18 +21,17 @@ slot_re = re.compile('^(\(~\))?([^\(]+)(\([^\)]+\))$')
 def identify_service_from_bin(exe):
     log = logging.getLogger(sau.LOGNAME)
 
+    with open('/proc/1/comm', 'r') as f:
+        if f.readline().strip() == 'systemd':
+            init_script_re = re.compile(r'[^/]*(.*)\.service$')
+        else:
             init_script_re = re.compile(r'/etc/init\.d/(.*)')
 
     cmd = [ EQUERY_PATH, '-Cq', 'b', exe ]
     ret, out, err = sau.helpers.exec_cmd(cmd)
 
     if ret != 0:
-        log.warning("searching for owner of {} failed:".format(exe))
+        raise sau.errors.UnknownServiceError("searching for owner of {} failed:".format(exe))
-        for line in out.splitlines():
-            log.warning("stdout: {}".format(line))
-        for line in err.splitlines():
-            log.warning("stderr: {}".format(line))
-        return None
     
     pkg = out.strip()
     cmd = [ EQUERY_PATH, '-Cq', 'f', pkg ]
@@ -48,9 +50,9 @@ def identify_service_from_bin(exe):
         if match:
             matches.add(match.group(1))
     if len(matches) < 1:
-        log.warning('Could not find any init script in package {}'.format(pkg))
+        raise sau.errors.UnknownServiceError('Could not find any init script in package {}'.format(pkg))
     elif len(matches) > 1:
-        log.warning('Found multiple init script in package {}'.format(pkg))
+        raise sau.errors.UnknownServiceError('Found multiple init script in package {}'.format(pkg))
     else:
         return matches.pop()
     return None
@@ -58,6 +60,10 @@ def identify_service_from_bin(exe):
 
 def restart_service(service):
     log = logging.getLogger(sau.LOGNAME)
+    with open('/proc/1/comm', 'r') as f:
+        if f.readline().strip() == 'systemd':
+            cmd = [ SYSTEMCTL, 'restart', service ]
+        else:
             cmd = [ RC_SERVICE_PATH, service, 'restart' ]
     ret, out, err = sau.helpers.exec_cmd(cmd)
 
@@ -72,7 +78,7 @@ def restart_service(service):
 
 def system_upgrade():
     log = logging.getLogger(sau.LOGNAME)
-    log.debug('Gentoo has no concept of system upgrade, ignoring...')
+    log.debug('Gentoo "system_upgrade" is done at package upgrade stage; ignoring here...')
     return False
 
 def _sync_portage():
@@ -86,7 +92,18 @@ def _sync_portage():
         ret, out, err = sau.helpers.exec_cmd(cmd, timeout=3600)
 
     if ret != 0:
-        log.warning("Portage sync failed:")
+        log.error("Portage sync failed:")
+        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'Sync command {cmd} failed')
+
+    cmd = [ EMAINT_PATH, '-f', 'all' ]
+    ret, out, err = sau.helpers.exec_cmd(cmd, timeout=3600)
+
+    if ret != 0:
+        log.warning("emaint failed:")
         for line in out.splitlines():
             log.warning("stdout: {}".format(line))
         for line in err.splitlines():
@@ -94,23 +111,22 @@ def _sync_portage():
 
 
 
+
 def pkg_upgrade():
     log = logging.getLogger(sau.LOGNAME)
     conf = sau.config
+    do_system_upgrade = conf.getboolean('default', 'do_system_upgrade', fallback=False)
 
     if conf.getboolean('default', 'do_reposync', fallback=True):
         _sync_portage()
 
     # [ebuild     U ] media-plugins/alsa-plugins-1.1.8 [1.1.6]
-    pretend_re = re.compile(r'^\[ebuild ([^\]]*)\] ([^ ]+)( \[[^\]]+\])?')
+    pretend_re = re.compile(r'^\[(?:ebuild|binary) ([^\]]*)\] ([^ ]+?)-(\d[-\.\w]*)( \[[^\]]+\])?')
-    # media-plugins/alsa-plugins-1.1.8
-    version_re = re.compile(r'^(.*/.*)-(\d+.*)$')
-
     ignore_re = re.compile(r'^(|.*caus.* rebuilds.*|.*scheduled for merge.*|.*waiting for lock on.*)$')
     
     default_version_sens = conf.getint('default', 'version_sensitivity', fallback=1)
 
-    cmd = [ EMERGE_PATH, '--color', 'n', '-uDNpq', '@world' ]
+    cmd = [ EMERGE_PATH, '--color', 'n', '-uDNpq', '--with-bdeps=y', '@world' ]
     ret, out, err = sau.helpers.exec_cmd(cmd)
 
     if not ret == 0:
@@ -119,9 +135,10 @@ def pkg_upgrade():
             log.error('stdout: {}'.format(line))
         for line in err.splitlines():
             log.error('stderr: {}'.format(line))
-        return False
+        raise sau.errors.UpgradeError(f'Failed to calculate upgrade path')
 
     do_rebuild = True
+    do_grub = False
     for line in out.splitlines():
         if re.match(ignore_re, line):
             continue
@@ -131,35 +148,38 @@ def pkg_upgrade():
             continue
         status = match.group(1)
         name = match.group(2)
-        old = match.group(3)
+        new = match.group(3)
+        old = match.group(4)
         if not old:
             continue
         old = old.strip(' []')
-        nmatch = re.match(version_re, name)
-        name = nmatch.group(1)
-        version = nmatch.group(2)
 
         sens = conf.getint('packages', name, fallback=default_version_sens)
-        common = sau.helpers.version_diff(version, old)
+        common = sau.helpers.version_diff(new, old)
         if sens <= common:
-            log.info('{}-{} -> {} configured level {} <= pkg level {}'.format(name, old, version, sens, common))
+            log.info('{} -- {} -> {} configured level {} <= pkg level {}'.format(name, old, new, sens, common))
         else:
-            log.warning('{}-{} -> {} configured level {} > pkg level {}'.format(name, old, version, sens, common))
+            log.error('{} -- {} -> {} configured level {} > pkg level {}'.format(name, old, new, sens, common))
             do_rebuild = False
+        if name.startswith('sys-kernel/'):
+            if do_system_upgrade:
+                do_grub = True
+            else:
+                raise sau.errors.UpgradeError(f"Kernel package {name} has an update, but system upgrade is disabled")
 
     if not do_rebuild:
-        log.warning('Some packages require manual attention, did not upgrade')
+        raise sau.errors.UpgradeError('Some packages require manual attention, did not upgrade')
-        return False
 
-    cmd = [ EMERGE_PATH, '--color', 'n', '-uDNq', '@world' ]
+    cmd = [ EMERGE_PATH, '--color', 'n', '-uDNq', '--with-bdeps=y', '@world' ]
     ret, out, err = sau.helpers.exec_cmd(cmd, timeout=72000)
 
     if ret != 0 or err:
-        log.warning('emerge returned {}'.format(ret))
+        log.error('emerge returned {}'.format(ret))
         for line in out.splitlines():
-            log.warning('stdout: {}'.format(line))
+            log.error('stdout: {}'.format(line))
         for line in err.splitlines():
-            log.warning('stderr: {}'.format(line))
+            log.error('stderr: {}'.format(line))
+        raise sau.errors.UpgradeError(f'Error during upgrade')
     else:
         log.info('upgrade complete')
         for line in out.splitlines():
@@ -170,11 +190,12 @@ def pkg_upgrade():
     ret, out, err = sau.helpers.exec_cmd(cmd, timeout=72000)
 
     if ret != 0 or err:
-        log.warning('preserved-rebuild returned {}'.format(ret))
+        log.error('preserved-rebuild returned {}'.format(ret))
         for line in out.splitlines():
-            log.warning('stdout: {}'.format(line))
+            log.error('stdout: {}'.format(line))
         for line in err.splitlines():
-            log.warning('stderr: {}'.format(line))
+            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():
@@ -185,13 +206,42 @@ def pkg_upgrade():
         cmd = [ EMERGE_PATH, '--color', 'n', '-q', '--depclean' ]
         ret, out, err = sau.helpers.exec_cmd(cmd, timeout=3600)
         if ret != 0 or err:
-            log.warning('depclean returned {}'.format(ret))
+            log.error('depclean returned {}'.format(ret))
             for line in out.splitlines():
-                log.warning('stdout: {}'.format(line))
+                log.error('stdout: {}'.format(line))
             for line in err.splitlines():
-                log.warning('stderr: {}'.format(line))
+                log.error('stderr: {}'.format(line))
+            raise sau.errors.UpgradeError(f'Error during depclean')
         else:
             log.info('depclean complete')
             for line in out.splitlines():
                 if line.startswith(' * '):
                     log.warning(line)
+
+    if do_grub and os.path.exists(GRUB_MKCONFIG):
+        keep_kernels = conf.getint('default', 'keep_kernels', fallback=4)
+        if keep_kernels < 1:
+            log.error('keep_kernels cannot be less than one; falling back to default')
+            keep_kernels = 4
+        for root, dirs, files in os.walk('/boot'):
+            for sysfile in ['config', 'initramfs', 'System.map', 'vmlinuz']:
+                match = sorted(
+                        [f for f in files if f.startswith(f'{sysfile}-')],
+                        reverse=True)
+                for f in match[keep_kernels:]:
+                    log.debug(f"Removing old kernel file {f}")
+                    os.remove(os.path.join(root, f))
+            break
+
+        cmd = [ GRUB_MKCONFIG, '-o', '/boot/grub/grub.cfg' ]
+        ret, out, err = sau.helpers.exec_cmd(cmd)
+        if ret != 0:
+            log.error(f"grub-mkconfig returned {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'Failed to reconfiugre grub')
+        else:
+            log.info("grub reconfigured")
+            return True

setup.py

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