diff options
| author | Lorin Hochstein <lorin@nimbisservices.com> | 2013-03-31 21:41:58 -0400 |
|---|---|---|
| committer | Lorin Hochstein <lorin@nimbisservices.com> | 2013-03-31 21:41:58 -0400 |
| commit | 614642f8e919e64d5a578b52936b02c5d43e5b6b (patch) | |
| tree | 127980a2b7c44f9e33911fda1b441f2dd1cff2de | |
| parent | 304c447bd2d188fb35fe98b6758aa095712798d4 (diff) | |
| download | ansible-614642f8e919e64d5a578b52936b02c5d43e5b6b.tar.gz | |
Use aptitude safe-upgrade for apt upgrade=yes
Use aptitude safe-upgrade instead of apt-get upgrade to implement
apt: upgrade=yes. Using aptitude ensures that missing dependencies
will also be installed.
Fixes #2540
| -rw-r--r-- | library/apt | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/library/apt b/library/apt index 691f60d3cf..8946d0cccf 100644 --- a/library/apt +++ b/library/apt @@ -69,7 +69,7 @@ options: choices: [ "yes", "no" ] upgrade: description: - - 'If yes, performs an apt-get upgrade. If dist, performs an apt-get dist-upgrade. Note: This does not upgrade a specific package, use state=latest for that.' + - 'If yes, performs an aptitude safe-upgrade. If dist, performs an apt-get dist-upgrade. Note: This does not upgrade a specific package, use state=latest for that.' version_added: "1.1" required: false default: no @@ -91,6 +91,7 @@ examples: description: Install latest version of C(openjdk-6-jdk) ignoring C(install-reccomends) - code: "apt: upgrade=dist" description: Update all packages to the latest version +requirements: [ python-apt, aptitude ] ''' import traceback @@ -188,13 +189,19 @@ def remove(m, pkgspec, cache, purge=False): def upgrade(m, mode="yes"): upgrade_command = 'upgrade' if mode == "dist": - upgrade_command = 'dist-upgrade' - cmd = '%s -q -y -o "Dpkg::Options::=--force-confdef" -o "Dpkg::Options::=--force-confold" %s' % (APT, upgrade_command) - rc, out, err = m.run_command(cmd) - if rc: - m.fail_json(msg="'apt-get %s' failed: %s" % (upgrade_command, err)) - if "0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded." in out : - m.exit_json(changed=False) + cmd = '%s -q -y -o "Dpkg::Options::=--force-confdef" -o "Dpkg::Options::=--force-confold" dist-upgrade' % APT + rc, out, err = m.run_command(cmd) + if rc: + m.fail_json(msg="'apt-get %s' failed: %s" % (upgrade_command, err)) + if "0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded." in out : + m.exit_json(changed=False) + else: + cmd = "/usr/bin/aptitude safe-upgrade -y" + rc, out, err = m.run_command(cmd) + if rc: + m.fail_json(msg="'aptitude safe-upgrade' failed: %s" % err) + if "No packages will be installed, upgraded, or removed." in out: + m.exit_json(changed=False) m.exit_json(changed=True) def main(): |