Compare commits
4 Commits
Author | SHA1 | Date | |
---|---|---|---|
6fd96562ae
|
|||
76fe384d0f
|
|||
3d3dd379b7
|
|||
cc206f6198
|
@ -168,7 +168,7 @@ def get_eclasses(atom):
|
||||
return eclasses
|
||||
|
||||
def get_dependencies(atom):
|
||||
cmd=[ EQUERY_PATH, '-q', 'd', '-F', '$cp', name ]
|
||||
cmd=[ EQUERY_PATH, '-q', 'd', '-F', '$cp', atom ]
|
||||
ret, out, err = sau.helpers.exec_cmd(cmd)
|
||||
dependencies = [l.strip() for l in out.splitlines()]
|
||||
return dependencies
|
||||
@ -285,7 +285,7 @@ def pkg_upgrade():
|
||||
elif go_packages:
|
||||
dependencies = []
|
||||
for package in go_packages:
|
||||
dependencies.append(get_dependencies(package))
|
||||
dependencies.extend(get_dependencies(package))
|
||||
dependencies = set(dependencies)
|
||||
upgraded = set(rebuild_packages.keys())
|
||||
not_upgraded = dependencies-upgraded
|
||||
|
@ -12,6 +12,9 @@ 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'):
|
||||
@ -182,7 +185,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 ('restart', 'warn', 'ignore', 'silent-restart', 'reboot', 'silent-reboot'):
|
||||
if policy and policy.lower() in valid_service_policies:
|
||||
return policy.lower()
|
||||
elif policy:
|
||||
log.warning('service policy {} for {} is invalid'.format(policy, service))
|
||||
@ -230,6 +233,9 @@ 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'):
|
||||
|
Reference in New Issue
Block a user