Compare commits
No commits in common. "master" and "v1.4.0" have entirely different histories.
@ -119,9 +119,6 @@ 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
|
||||
@ -143,7 +140,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)
|
||||
@ -171,7 +168,7 @@ def get_eclasses(atom):
|
||||
return eclasses
|
||||
|
||||
def get_dependencies(atom):
|
||||
cmd=[ EQUERY_PATH, '-q', 'd', '-F', '$cp', atom ]
|
||||
cmd=[ EQUERY_PATH, '-q', 'd', '-F', '$cp', name ]
|
||||
ret, out, err = sau.helpers.exec_cmd(cmd)
|
||||
dependencies = [l.strip() for l in out.splitlines()]
|
||||
return dependencies
|
||||
@ -266,7 +263,7 @@ def pkg_upgrade():
|
||||
|
||||
## rebuild as needed
|
||||
do_rebuild = conf.getboolean('default', 'do_rebuilds', fallback=True)
|
||||
if do_rebuild:
|
||||
if do_rebuilds:
|
||||
# from here on we shouldn't need to rebuild the upgraded packages again
|
||||
exclude_list = ' --exclude '.join(rebuild_packages.keys()).split()
|
||||
|
||||
@ -282,13 +279,13 @@ def pkg_upgrade():
|
||||
EMERGE_PATH,
|
||||
'--color', 'n',
|
||||
'-q',
|
||||
'--usepkg', 'n',
|
||||
'--usepkg-exclude', '*/*',
|
||||
'@golang-rebuild',
|
||||
'--exclude' ] + exclude_list
|
||||
elif go_packages:
|
||||
dependencies = []
|
||||
for package in go_packages:
|
||||
dependencies.extend(get_dependencies(package))
|
||||
dependencies.append(get_dependencies(package))
|
||||
dependencies = set(dependencies)
|
||||
upgraded = set(rebuild_packages.keys())
|
||||
not_upgraded = dependencies-upgraded
|
||||
@ -298,7 +295,7 @@ def pkg_upgrade():
|
||||
EMERGE_PATH,
|
||||
'--color', 'n',
|
||||
'-q',
|
||||
'--usepkg', 'n'] + not_upgraded
|
||||
'--usepkg-exclude', '*/*'] + not_upgraded
|
||||
if cmd:
|
||||
ret, out, err = sau.helpers.exec_cmd(cmd, timeout=72000)
|
||||
if ret != 0 or err:
|
||||
@ -315,13 +312,13 @@ def pkg_upgrade():
|
||||
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")
|
||||
if 'dev-lang/rust' in rebuild_packages:
|
||||
log.info("Running rust-rebuild due to update of dev-lang/rust")
|
||||
cmd = [
|
||||
EMERGE_PATH,
|
||||
'--color', 'n',
|
||||
'-q',
|
||||
'--usepkg', 'n',
|
||||
'--usepkg-exclude', '*/*',
|
||||
'@rust-rebuild',
|
||||
'--exclude' ] + exclude_list
|
||||
ret, out, err = sau.helpers.exec_cmd(cmd, timeout=72000)
|
||||
@ -341,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', 'n']
|
||||
cmd = [ PCLEAN_PATH, '--all', '--', '-q', '--usepkg-exclude', '*/*']
|
||||
ret, out, err = sau.helpers.exec_cmd(cmd, timeout=72000)
|
||||
if ret != 0 or err:
|
||||
log.error('perl-cleaner failed with code {}'.format(ret))
|
||||
@ -357,7 +354,7 @@ def pkg_upgrade():
|
||||
log.warning(line)
|
||||
|
||||
# rebuild live packages
|
||||
cmd = [ EMERGE_PATH, '--color', 'n', '-q', '--usepkg', 'n', '@live-rebuild' ]
|
||||
cmd = [ EMERGE_PATH, '--color', 'n', '-q', '--usepkg-exclude', '*/*', '@live-rebuild' ]
|
||||
ret, out, err = sau.helpers.exec_cmd(cmd, timeout=3600)
|
||||
if ret != 0 or err:
|
||||
log.error('live-rebuild returned {}'.format(ret))
|
||||
@ -392,7 +389,7 @@ def pkg_upgrade():
|
||||
|
||||
|
||||
## Preserved rebuild
|
||||
cmd = [ EMERGE_PATH, '--color', 'n', '--usepkg', 'n', '-q', '@preserved-rebuild' ]
|
||||
cmd = [ EMERGE_PATH, '--color', 'n', '--usepkg-exclude', '*/*', '-q', '@preserved-rebuild' ]
|
||||
ret, out, err = sau.helpers.exec_cmd(cmd, timeout=72000)
|
||||
|
||||
if ret != 0 or err:
|
||||
|
||||
@ -12,9 +12,6 @@ import sau.platforms
|
||||
|
||||
proc_fd_map_re = re.compile(r'^.*(/(?:usr|lib|opt|etc|s?bin)[^\(]*) \(deleted\)$')
|
||||
|
||||
valid_service_policies=('restart', 'warn', 'ignore', 'silent-restart',
|
||||
'reboot', 'silent-reboot')
|
||||
|
||||
def _warn(policy, msg):
|
||||
log = logging.getLogger(sau.LOGNAME)
|
||||
if not policy.startswith('silent'):
|
||||
@ -185,7 +182,7 @@ def _get_service_restart_policy(service):
|
||||
log = logging.getLogger(sau.LOGNAME)
|
||||
conf = sau.config
|
||||
policy = conf.get('services', service, fallback=None)
|
||||
if policy and policy.lower() in valid_service_policies:
|
||||
if policy and policy.lower() in ('restart', 'warn', 'ignore', 'silent-restart', 'reboot', 'silent-reboot'):
|
||||
return policy.lower()
|
||||
elif policy:
|
||||
log.warning('service policy {} for {} is invalid'.format(policy, service))
|
||||
@ -233,9 +230,6 @@ def _get_service_from_proc(proc):
|
||||
log.warning(f'Not restarting user service {unit}; please log out and log in again')
|
||||
return None
|
||||
else:
|
||||
policy = conf.get('services', name, fallback=None)
|
||||
if policy and policy.lower() in valid_service_policies:
|
||||
return name
|
||||
_ret, enabled, _err = sau.helpers.exec_cmd([ '/usr/bin/systemctl', 'is-enabled', unit ])
|
||||
enabled = enabled.strip()
|
||||
if enabled not in ('enabled', 'static'):
|
||||
|
||||
Loading…
Reference in New Issue
Block a user