feffe/sau
1
0
Fork 0
Code Issues Pull Requests Projects Releases 24 Wiki Activity

fix usepkg on gentoo rebuilds

Browse Source
This commit is contained in:
Fredrik Eriksson
2024-08-29 10:58:34 +02:00
parent 9f08c5f687
commit 0f713bf476
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sau/gentoo.py
View File

@ -279,7 +279,7 @@ def pkg_upgrade():
EMERGE_PATH, EMERGE_PATH,
'--color', 'n', '--color', 'n',
'-q', '-q',
'--usepkg-exclude', '*/*', '--usepkg', 'n',
'@golang-rebuild', '@golang-rebuild',
'--exclude' ] + exclude_list '--exclude' ] + exclude_list
elif go_packages: elif go_packages:
@ -295,7 +295,7 @@ def pkg_upgrade():
EMERGE_PATH, EMERGE_PATH,
'--color', 'n', '--color', 'n',
'-q', '-q',
'--usepkg-exclude', '*/*'] + not_upgraded '--usepkg', 'n'] + not_upgraded
if cmd: if cmd:
ret, out, err = sau.helpers.exec_cmd(cmd, timeout=72000) ret, out, err = sau.helpers.exec_cmd(cmd, timeout=72000)
if ret != 0 or err: if ret != 0 or err:
@ -318,7 +318,7 @@ def pkg_upgrade():
EMERGE_PATH, EMERGE_PATH,
'--color', 'n', '--color', 'n',
'-q', '-q',
'--usepkg-exclude', '*/*', '--usepkg', 'n',
'@rust-rebuild', '@rust-rebuild',
'--exclude' ] + exclude_list '--exclude' ] + exclude_list
ret, out, err = sau.helpers.exec_cmd(cmd, timeout=72000) ret, out, err = sau.helpers.exec_cmd(cmd, timeout=72000)
@ -338,7 +338,7 @@ def pkg_upgrade():
# run perl-cleaner # run perl-cleaner
if 'dev-lang/perl' in rebuild_packages: if 'dev-lang/perl' in rebuild_packages:
log.info("Running perl-cleaner due to perl upgrade") 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) ret, out, err = sau.helpers.exec_cmd(cmd, timeout=72000)
if ret != 0 or err: if ret != 0 or err:
log.error('perl-cleaner failed with code {}'.format(ret)) log.error('perl-cleaner failed with code {}'.format(ret))
@ -354,7 +354,7 @@ def pkg_upgrade():
log.warning(line) log.warning(line)
# rebuild live packages # 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) ret, out, err = sau.helpers.exec_cmd(cmd, timeout=3600)
if ret != 0 or err: if ret != 0 or err:
log.error('live-rebuild returned {}'.format(ret)) log.error('live-rebuild returned {}'.format(ret))
@ -389,7 +389,7 @@ def pkg_upgrade():
## Preserved rebuild ## 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) ret, out, err = sau.helpers.exec_cmd(cmd, timeout=72000)
if ret != 0 or err: if ret != 0 or err:

2
setup.py
View File

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