diff options
| author | Sander Vrijders <sander.vrijders@ugent.be> | 2018-01-12 15:00:48 +0100 |
|---|---|---|
| committer | Sander Vrijders <sander.vrijders@ugent.be> | 2018-01-12 15:00:48 +0100 |
| commit | 89cb2a104bb04351c93b92c8f312e6c22fd89326 (patch) | |
| tree | 34341a842d5a1228add014ac1075aa3d8f78c418 | |
| parent | 30747f9ea71610a0b2e41db407c0a9090e37144c (diff) | |
| parent | d8ee9eae0f08b9408a143cea71f0114457660c30 (diff) | |
| download | rumba-89cb2a104bb04351c93b92c8f312e6c22fd89326.tar.gz rumba-89cb2a104bb04351c93b92c8f312e6c22fd89326.zip | |
Merge branch 'master' into testing
| -rw-r--r-- | rumba/ssh_support.py | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/rumba/ssh_support.py b/rumba/ssh_support.py index 1ffa655..69c049c 100644 --- a/rumba/ssh_support.py +++ b/rumba/ssh_support.py @@ -406,13 +406,9 @@ def aptitude_install(testbed, node, packages): package_install += package + " " package_install += "--yes" - cmds = [sudo("systemctl disable apt-daily.service || true"), - sudo("systemctl disable apt-daily.timer || true"), - sudo("systemctl stop apt-daily.service || true"), - sudo("systemctl stop apt-daily.timer || true"), - sudo("sh -c 'while fuser /var/lib/dpkg/lock > /dev/null 2>&1; " + + cmds = [sudo("sh -c 'while fuser /var/lib/dpkg/lock > /dev/null 2>&1; " + "do sleep 1; echo \"Waiting for dpkg...\"; done'"), - sudo("apt-get update"), - sudo(package_install)] + "while ! " + sudo("apt-get update") + "; do sleep 1; done", + "while ! " + sudo(package_install) + "; do sleep 1; done"] execute_proxy_commands(testbed, node.ssh_config, cmds, time_out=None) |