bump version

config.cfg

@@ -30,6 +30,9 @@ default_service_policy=ignore
 # do depclean on Gentoo
 do_depclean=yes
 
+# do eix-sync on Gentoo
+do_reposync=yes
+
 # to only write to stderr when something unexpected happens or manual action is required
 # set stderr_loglevel to warning
 stderr_loglevel=debug
@@ -41,12 +44,12 @@ 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
-sys-kernel/gentoo-sources=-1
-sys-kernel/spl=-1
-sys-fs/zfs-kmod=-1
+sys-kernel/gentoo-sources=99
+sys-kernel/spl=99
+sys-fs/zfs-kmod=99
 
 # FreeBSD uses the short package name (without category)
 gitlab=2

sau/gentoo.py

@@ -98,13 +98,11 @@ def pkg_upgrade():
     log = logging.getLogger(sau.LOGNAME)
     conf = sau.config
 
-    _sync_portage()
+    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 ([^\]]*)\] ([^ ]+)( \[[^\]]+\])?')
-    # media-plugins/alsa-plugins-1.1.8
-    version_re = re.compile(r'^(.*/.*)-(\d+.*)$')
-
+    pretend_re = re.compile(r'^\[(?:ebuild|binary) ([^\]]*)\] ([^ ]+?)-(\d[-\.\w]*)( \[[^\]]+\])?')
     ignore_re = re.compile(r'^(|.*caus.* rebuilds.*|.*scheduled for merge.*|.*waiting for lock on.*)$')
     
     default_version_sens = conf.getint('default', 'version_sensitivity', fallback=1)
@@ -130,20 +128,18 @@ 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.warning('{} -- {} -> {} configured level {} > pkg level {}'.format(name, old, new, sens, common))
             do_rebuild = False
 
     if not do_rebuild:

setup.py

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