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

only upgrade on freebsd if no package require manual attention

Browse Source
This commit is contained in:
Fredrik Eriksson 2019-04-07 10:02:44 +02:00
parent d0cb0d1124
commit 6f19bf71ca
No known key found for this signature in database
GPG Key ID: 8825C73A0FD1502A
1 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
sau/freebsd.py
View File

@ -151,27 +151,26 @@ def pkg_upgrade():
else:
log.debug('configured level {} < pkg level {}'.format(diff, pkg['upgrade_level']))
pkg['upgrade'] = False
upgradables = [x['pkg'] for x in upgrades if x['upgrade'] ]
if upgradables:
cmd = [ PKG_PATH, 'upgrade', '-yq' ] + upgradables
log.debug('Executing "{}"'.format(' '.join(cmd)))
proc = subprocess.Popen(
cmd,
stdout = subprocess.PIPE,
stderr = subprocess.PIPE)
out, err = proc.communicate()
out = out.decode('utf-8')
err = err.decode('utf-8')
if proc.returncode != 0 or err:
log.warning('{} failed:'.format(' '.join(cmd)))
for line in out.splitlines():
log.warning('stdout: {}'.format(line))
for line in err.splitlines():
log.warning('stderr: {}'.format(line))
for pkg in [x for x in upgrades if not x['upgrade']]:
log.warning('Package require manual upgrade: {} {} -> {}'.format(pkg['pkg'], pkg['version_old'], pkg['version_new']))
log.warning('Package require manual upgrade, no upgrades done: {} {} -> {}'.format(pkg['pkg'], pkg['version_old'], pkg['version_new']))
return False
cmd = [ PKG_PATH, 'upgrade', '-yq' ]
log.debug('Executing "{}"'.format(' '.join(cmd)))
proc = subprocess.Popen(
cmd,
stdout = subprocess.PIPE,
stderr = subprocess.PIPE)
out, err = proc.communicate()
out = out.decode('utf-8')
err = err.decode('utf-8')
if proc.returncode != 0 or err:
log.warning('{} failed:'.format(' '.join(cmd)))
for line in out.splitlines():
log.warning('stdout: {}'.format(line))
for line in err.splitlines():
log.warning('stderr: {}'.format(line))
return True