Compare commits
5 Commits
Author | SHA1 | Date | |
---|---|---|---|
00496493cd
|
|||
434858174c
|
|||
a4a28a1fb3
|
|||
ae560e96c0
|
|||
9970fe3365
|
2
bin/sau
2
bin/sau
@ -115,7 +115,7 @@ def main():
|
|||||||
log.error(f'Upgrade failed: {e}')
|
log.error(f'Upgrade failed: {e}')
|
||||||
return 1
|
return 1
|
||||||
|
|
||||||
if not conf.getboolean('default', 'live_system', True):
|
if not conf.getboolean('default', 'live_system', fallback=True):
|
||||||
return 0
|
return 0
|
||||||
|
|
||||||
if conf.getboolean('default', 'do_service_restart', fallback=True):
|
if conf.getboolean('default', 'do_service_restart', fallback=True):
|
||||||
|
@ -117,6 +117,7 @@ def is_system_package(atom, eclasses):
|
|||||||
# sys-boot/ category should probably always be considered
|
# sys-boot/ category should probably always be considered
|
||||||
# system-packages
|
# system-packages
|
||||||
if name.split('/')[0] == 'sys-boot':
|
if name.split('/')[0] == 'sys-boot':
|
||||||
|
log.debug(f"{name} is a sys-boot package")
|
||||||
return True
|
return True
|
||||||
|
|
||||||
# libc-packages should be considered system-packages as they generally
|
# 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
|
# then just checking for specific packages here, but as far as I know there
|
||||||
# are not many of them anyway...
|
# are not many of them anyway...
|
||||||
if re.search(r'^sys-libs/(glibc|musl)', name):
|
if re.search(r'^sys-libs/(glibc|musl)', name):
|
||||||
|
log.debug(f"{name} is a libc package")
|
||||||
return True
|
return True
|
||||||
|
|
||||||
if any([
|
if any([
|
||||||
@ -132,6 +134,7 @@ def is_system_package(atom, eclasses):
|
|||||||
'linux-mod',
|
'linux-mod',
|
||||||
'kernel-install' ]
|
'kernel-install' ]
|
||||||
]):
|
]):
|
||||||
|
log.debug(f"{name} is of system eclass (eclasses: {eclasses})")
|
||||||
return True
|
return True
|
||||||
return False
|
return False
|
||||||
|
|
||||||
@ -233,7 +236,7 @@ def pkg_upgrade():
|
|||||||
if do_system_upgrade:
|
if do_system_upgrade:
|
||||||
do_grub = True
|
do_grub = True
|
||||||
else:
|
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:
|
if not do_rebuild:
|
||||||
raise sau.errors.UpgradeError('Some packages require manual attention, did not upgrade')
|
raise sau.errors.UpgradeError('Some packages require manual attention, did not upgrade')
|
||||||
|
2
setup.py
2
setup.py
@ -5,7 +5,7 @@ from setuptools import setup, find_packages
|
|||||||
|
|
||||||
setup(
|
setup(
|
||||||
name='sau',
|
name='sau',
|
||||||
version='1.3.2',
|
version='1.3.3',
|
||||||
description='Tool for auto-updating OS and packages',
|
description='Tool for auto-updating OS and packages',
|
||||||
author='Feffe',
|
author='Feffe',
|
||||||
author_email='feffe@fulh.ax',
|
author_email='feffe@fulh.ax',
|
||||||
|
Reference in New Issue
Block a user