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()
 

config.cfg

@@ -12,6 +12,10 @@
 # 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

sau/gentoo.py

@@ -117,6 +117,7 @@ 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
 
     # libc-packages should be considered system-packages as they generally
@@ -124,6 +125,7 @@ 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([
@@ -132,6 +134,7 @@ def is_system_package(atom, eclasses):
                 'linux-mod',
                 'kernel-install' ]
             ]):
+        log.debug(f"{name} is of system eclass (eclasses: {eclasses})")
         return True
     return False
 
@@ -233,7 +236,7 @@ def pkg_upgrade():
             if do_system_upgrade:
                 do_grub = True
             else:
-                raise sau.errors.UpgradeError(f"System 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')
@@ -260,7 +263,7 @@ def pkg_upgrade():
                 log.warning(line)
 
     # from here on we shouldn't need to rebuild the upgraded packages again
-    exclude_list = '--exclude '.join(rebuild_packages.keys()).split()
+    exclude_list = ' --exclude '.join(rebuild_packages.keys()).split()
 
     # Rebuild go
     go_packages = []

sau/services.py

@@ -141,6 +141,8 @@ 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()
@@ -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.3.0',
+        version='1.3.3',
         description='Tool for auto-updating OS and packages',
         author='Feffe',
         author_email='feffe@fulh.ax',