Compare commits
6 Commits
Author | SHA1 | Date | |
---|---|---|---|
f3abc1c257
|
|||
a6714d037b
|
|||
bbe23b1549
|
|||
17fc601022
|
|||
f1ded26b9f
|
|||
8d373f599c
|
@ -119,6 +119,9 @@ def is_system_package(atom, eclasses):
|
||||
log.debug(f"{name} is a sys-boot package")
|
||||
return True
|
||||
|
||||
if eclasses is True:
|
||||
return True
|
||||
|
||||
# libc-packages should be considered system-packages as they generally
|
||||
# requires the system to be restarted. Not sure if there is a better way
|
||||
# then just checking for specific packages here, but as far as I know there
|
||||
@ -140,7 +143,7 @@ def is_system_package(atom, eclasses):
|
||||
def get_eclasses(atom):
|
||||
log = logging.getLogger(sau.LOGNAME)
|
||||
eclasses = []
|
||||
name=re.sub(r'^[<=>]*(.*?)(?:-\d)?(?:::\w+)?$', r'\1', atom)
|
||||
name=re.sub(r'^[<=>]*(.*?)(?:-\d+)?(?:::\w+)?$', r'\1', atom)
|
||||
test_re = re.compile(r'^\s*inherit\s+')
|
||||
cmd=[ EQUERY_PATH, 'w', name ]
|
||||
ret, out, err = sau.helpers.exec_cmd(cmd)
|
||||
@ -267,50 +270,6 @@ def pkg_upgrade():
|
||||
# from here on we shouldn't need to rebuild the upgraded packages again
|
||||
exclude_list = ' --exclude '.join(rebuild_packages.keys()).split()
|
||||
|
||||
# Rebuild go
|
||||
go_packages = []
|
||||
cmd = None
|
||||
for package,eclasses in rebuild_packages.items():
|
||||
if 'go-module' in eclasses or package == 'dev-lang/go':
|
||||
go_packages.append(package)
|
||||
if 'dev-lang/go' in go_packages:
|
||||
log.info("Running golang-rebuild due to update of dev-lang/go")
|
||||
cmd = [
|
||||
EMERGE_PATH,
|
||||
'--color', 'n',
|
||||
'-q',
|
||||
'--usepkg', 'n',
|
||||
'@golang-rebuild',
|
||||
'--exclude' ] + exclude_list
|
||||
elif go_packages:
|
||||
dependencies = []
|
||||
for package in go_packages:
|
||||
dependencies.extend(get_dependencies(package))
|
||||
dependencies = set(dependencies)
|
||||
upgraded = set(rebuild_packages.keys())
|
||||
not_upgraded = dependencies-upgraded
|
||||
if not_upgraded:
|
||||
log.info(f'Rebuilding packages dependant of go modules {", ".join(go_packages)}')
|
||||
cmd = [
|
||||
EMERGE_PATH,
|
||||
'--color', 'n',
|
||||
'-q',
|
||||
'--usepkg', 'n'] + not_upgraded
|
||||
if cmd:
|
||||
ret, out, err = sau.helpers.exec_cmd(cmd, timeout=72000)
|
||||
if ret != 0 or err:
|
||||
log.error('Rebuild of go packages returned {}'.format(ret))
|
||||
for line in out.splitlines():
|
||||
log.error('stdout: {}'.format(line))
|
||||
for line in err.splitlines():
|
||||
log.error('stderr: {}'.format(line))
|
||||
raise sau.errors.UpgradeError(f'Error during go rebuild')
|
||||
else:
|
||||
log.info('go rebuild complete')
|
||||
for line in out.splitlines():
|
||||
if line.startswith(' * '):
|
||||
log.warning(line)
|
||||
|
||||
# rebuild rust
|
||||
if any([x in rebuild_packages for x in ('dev-lang/rust', 'dev-lang/rust-bin')]):
|
||||
log.info("Running rust-rebuild due to update of rust")
|
||||
@ -416,7 +375,8 @@ def pkg_upgrade():
|
||||
for sysfile in ['config', 'initramfs', 'System.map', 'vmlinuz', 'kernel']:
|
||||
match = sorted(
|
||||
[f for f in files if f.startswith(f'{sysfile}-')],
|
||||
reverse=True)
|
||||
reverse=True,
|
||||
key=lambda x: tuple(map(int, x.split('-')[1].split('.')[:3])))
|
||||
for f in match[keep_kernels:]:
|
||||
log.debug(f"Removing old kernel file {f}")
|
||||
os.remove(os.path.join(root, f))
|
||||
|
@ -177,7 +177,7 @@ def restart_services():
|
||||
if get_deleted_open_files(proc):
|
||||
service = services[proc_name]
|
||||
policy = _get_service_restart_policy(service)
|
||||
_warn(policy, f'{proc} still has deleted files open')
|
||||
log.warning(f'{proc} (service {service} with policy {policy}) still has deleted files open')
|
||||
recommend_restart = True
|
||||
return recommend_restart
|
||||
|
||||
|
Reference in New Issue
Block a user