Bump timeout for portage upgrade path calc
Many packages and slow CPU makes portage take long time to calculate world update path. Bumping to 1 hour timeout for now
This commit is contained in:
@@ -194,7 +194,7 @@ def pkg_upgrade():
|
|||||||
|
|
||||||
## Query upgradeable packages
|
## Query upgradeable packages
|
||||||
cmd = [ EMERGE_PATH, '--color', 'n', '-uDNpq', '--with-bdeps=y', '@world' ]
|
cmd = [ EMERGE_PATH, '--color', 'n', '-uDNpq', '--with-bdeps=y', '@world' ]
|
||||||
ret, out, err = sau.helpers.exec_cmd(cmd)
|
ret, out, err = sau.helpers.exec_cmd(cmd, timeout=3600)
|
||||||
|
|
||||||
if not ret == 0:
|
if not ret == 0:
|
||||||
log.error('emerge pretend returned {}'.format(ret))
|
log.error('emerge pretend returned {}'.format(ret))
|
||||||
@@ -315,7 +315,7 @@ def pkg_upgrade():
|
|||||||
|
|
||||||
# rebuild live packages
|
# rebuild live packages
|
||||||
cmd = [ EMERGE_PATH, '--color', 'n', '-q', '--usepkg', 'n', '@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=72000)
|
||||||
if ret != 0 or err:
|
if ret != 0 or err:
|
||||||
log.error('live-rebuild returned {}'.format(ret))
|
log.error('live-rebuild returned {}'.format(ret))
|
||||||
for line in out.splitlines():
|
for line in out.splitlines():
|
||||||
|
|||||||
Reference in New Issue
Block a user