From 9ad712018c697e49d86b4d5eddc025fa27af4655 Mon Sep 17 00:00:00 2001 From: Brian Coca Date: Tue, 18 Aug 2015 14:59:35 -0400 Subject: [PATCH] deal with more failures when apt module fails to instantiate pkg fixes #1499 --- lib/ansible/modules/packaging/os/apt.py | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/lib/ansible/modules/packaging/os/apt.py b/lib/ansible/modules/packaging/os/apt.py index 19a7c426f5e..92b0f2fb8fd 100644 --- a/lib/ansible/modules/packaging/os/apt.py +++ b/lib/ansible/modules/packaging/os/apt.py @@ -403,19 +403,20 @@ def install_deb(m, debs, cache, force, install_recommends, dpkg_options): for deb_file in debs.split(','): try: pkg = apt.debfile.DebPackage(deb_file) - except SystemError, e: - m.fail_json(msg="System Error: %s" % str(e)) - # Check if it's already installed - if pkg.compare_to_version_in_cache() == pkg.VERSION_SAME: - continue - # Check if package is installable - if not pkg.check() and not force: - m.fail_json(msg=pkg._failure_string) + # Check if it's already installed + if pkg.compare_to_version_in_cache() == pkg.VERSION_SAME: + continue + # Check if package is installable + if not pkg.check() and not force: + m.fail_json(msg=pkg._failure_string) + + # add any missing deps to the list of deps we need + # to install so they're all done in one shot + deps_to_install.extend(pkg.missing_deps) - # add any missing deps to the list of deps we need - # to install so they're all done in one shot - deps_to_install.extend(pkg.missing_deps) + except Exception, e: + m.fail_json(msg="Unable to install package: %s" % str(e)) # and add this deb to the list of packages to install pkgs_to_install.append(deb_file)