diff --git a/sau/gentoo.py b/sau/gentoo.py index 2af62b7..6c0d33c 100644 --- a/sau/gentoo.py +++ b/sau/gentoo.py @@ -279,7 +279,7 @@ def pkg_upgrade(): EMERGE_PATH, '--color', 'n', '-q', - '--usepkg-exclude', '*/*', + '--usepkg', 'n', '@golang-rebuild', '--exclude' ] + exclude_list elif go_packages: @@ -295,7 +295,7 @@ def pkg_upgrade(): EMERGE_PATH, '--color', 'n', '-q', - '--usepkg-exclude', '*/*'] + not_upgraded + '--usepkg', 'n'] + not_upgraded if cmd: ret, out, err = sau.helpers.exec_cmd(cmd, timeout=72000) if ret != 0 or err: @@ -318,7 +318,7 @@ def pkg_upgrade(): EMERGE_PATH, '--color', 'n', '-q', - '--usepkg-exclude', '*/*', + '--usepkg', 'n', '@rust-rebuild', '--exclude' ] + exclude_list ret, out, err = sau.helpers.exec_cmd(cmd, timeout=72000) @@ -338,7 +338,7 @@ def pkg_upgrade(): # run perl-cleaner if 'dev-lang/perl' in rebuild_packages: log.info("Running perl-cleaner due to perl upgrade") - cmd = [ PCLEAN_PATH, '--all', '--', '-q', '--usepkg-exclude', '*/*'] + cmd = [ PCLEAN_PATH, '--all', '--', '-q', '--usepkg', 'n'] ret, out, err = sau.helpers.exec_cmd(cmd, timeout=72000) if ret != 0 or err: log.error('perl-cleaner failed with code {}'.format(ret)) @@ -354,7 +354,7 @@ def pkg_upgrade(): log.warning(line) # rebuild live packages - cmd = [ EMERGE_PATH, '--color', 'n', '-q', '--usepkg-exclude', '*/*', '@live-rebuild' ] + cmd = [ EMERGE_PATH, '--color', 'n', '-q', '--usepkg', 'n', '@live-rebuild' ] ret, out, err = sau.helpers.exec_cmd(cmd, timeout=3600) if ret != 0 or err: log.error('live-rebuild returned {}'.format(ret)) @@ -389,7 +389,7 @@ def pkg_upgrade(): ## Preserved rebuild - cmd = [ EMERGE_PATH, '--color', 'n', '--usepkg-exclude', '*/*', '-q', '@preserved-rebuild' ] + cmd = [ EMERGE_PATH, '--color', 'n', '--usepkg', 'n', '-q', '@preserved-rebuild' ] ret, out, err = sau.helpers.exec_cmd(cmd, timeout=72000) if ret != 0 or err: diff --git a/setup.py b/setup.py index ddfa0ec..a58fc1a 100755 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ from setuptools import setup, find_packages setup( name='sau', - version='1.4.3', + version='1.4.4', description='Tool for auto-updating OS and packages', author='Feffe', author_email='feffe@fulh.ax',