RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-17 00:46:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Revert "Install.py: Prevent prompts from breaking apt""

Browse Source 
This reverts commit 67a616a979.

Sigh.  As it turns out, /etc/default/grub being hacked also
causes the same problem.  I think there's a way to fix that cleanly
as well, but until then, replacing the "accept installed version"
hack here so jobs can run.
This commit is contained in:
Dan Mick 2013-04-15 11:24:31 -07:00
parent 67a616a979
commit f69ddafde7
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
teuthology/task/install.py
View File

@ -130,7 +130,8 @@ def _update_deb_package_list_and_install(ctx, remote, debs, config):
remote.run(
args=[
'sudo', 'apt-get', 'update', run.Raw('&&'),
'sudo', 'apt-get', '-y', '--force-yes',
'sudo', 'DEBIAN_FRONTEND=noninteractive', 'apt-get', '-y', '--force-yes',
'-o', run.Raw('Dpkg::Options::="--force-confdef"'), '-o', run.Raw('Dpkg::Options::="--force-confold"'),
'install',
] + ['%s=%s' % (d, version) for d in debs],
stdout=StringIO(),
@ -212,7 +213,8 @@ def _remove_deb(remote, debs):
] + debs + [
run.Raw(';'),
'do',
'sudo', 'apt-get', '-y', '--force-yes', 'purge',
'sudo', 'DEBIAN_FRONTEND=noninteractive', 'apt-get', '-y', '--force-yes',
'-o', run.Raw('Dpkg::Options::="--force-confdef"'), '-o', run.Raw('Dpkg::Options::="--force-confold"'), 'purge',
run.Raw('$d'),
run.Raw('||'),
'true',
@ -235,7 +237,8 @@ def _remove_deb(remote, debs):
# then let apt clean up
remote.run(
args=[
'sudo', 'apt-get', '-y', '--force-yes',
'sudo', 'DEBIAN_FRONTEND=noninteractive', 'apt-get', '-y', '--force-yes',
'-o', run.Raw('Dpkg::Options::="--force-confdef"'), '-o', run.Raw('Dpkg::Options::="--force-confold"'),
'autoremove',
],
stdout=StringIO(),
@ -468,7 +471,8 @@ def _upgrade_ceph_packages(ctx, remote, debs, ceph_branch):
remote.run(
args=[
'sudo', 'apt-get', 'update', run.Raw('&&'),
'sudo', 'apt-get', '-y', '--force-yes',
'sudo', 'DEBIAN_FRONTEND=noninteractive', 'apt-get', '-y', '--force-yes',
'-o', run.Raw('Dpkg::Options::="--force-confdef"'), '-o', run.Raw('Dpkg::Options::="--force-confold"'),
'upgrade',
] + ['%s=%s' % (d, version) for d in debs],
stdout=StringIO(),