4 Commits

Author SHA1 Message Date
06ad5bde9e bump version 2021-07-04 15:05:04 +02:00
ac1a0baf92 thinking makes me insane :( 2021-07-04 15:00:42 +02:00
214ec6abad fix version calculation on gentoo 2021-07-04 14:52:35 +02:00
f5adcbc140 hopefully fixed logic error... 2021-07-04 13:51:25 +02:00
3 changed files with 11 additions and 16 deletions

View File

@ -44,12 +44,12 @@ syslog_loglevel=info
# platform # platform
[packages] [packages]
# Gentoo uses the category/package naming scheme # Gentoo uses the category/package naming scheme
dev-db/postgresql=2 dev-db/postgresql=1
# Gentoo kernel stuff should be updated manually # Gentoo kernel stuff should be updated manually
sys-kernel/gentoo-sources=-1 sys-kernel/gentoo-sources=99
sys-kernel/spl=-1 sys-kernel/spl=99
sys-fs/zfs-kmod=-1 sys-fs/zfs-kmod=99
# FreeBSD uses the short package name (without category) # FreeBSD uses the short package name (without category)
gitlab=2 gitlab=2

View File

@ -102,10 +102,7 @@ def pkg_upgrade():
_sync_portage() _sync_portage()
# [ebuild U ] media-plugins/alsa-plugins-1.1.8 [1.1.6] # [ebuild U ] media-plugins/alsa-plugins-1.1.8 [1.1.6]
pretend_re = re.compile(r'^\[(?:ebuild|binary) ([^\]]*)\] ([^ ]+)( \[[^\]]+\])?') 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.*)$') ignore_re = re.compile(r'^(|.*caus.* rebuilds.*|.*scheduled for merge.*|.*waiting for lock on.*)$')
default_version_sens = conf.getint('default', 'version_sensitivity', fallback=1) default_version_sens = conf.getint('default', 'version_sensitivity', fallback=1)
@ -131,20 +128,18 @@ def pkg_upgrade():
continue continue
status = match.group(1) status = match.group(1)
name = match.group(2) name = match.group(2)
old = match.group(3) new = match.group(3)
old = match.group(4)
if not old: if not old:
continue continue
old = old.strip(' []') 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) 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: 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: else:
log.warning('{}-{} -> {} configured level {} > pkg level {}'.format(name, old, version, sens, common)) log.warning('{} -- {} -> {} configured level {} > pkg level {}'.format(name, old, new, sens, common))
do_rebuild = False do_rebuild = False
if not do_rebuild: if not do_rebuild:

View File

@ -5,7 +5,7 @@ from setuptools import setup, find_packages
setup( setup(
name='sau', name='sau',
version='0.9.2', version='0.9.4',
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',