diff --git a/ansible.changes b/ansible.changes index 044ef0f..44c7c1b 100644 --- a/ansible.changes +++ b/ansible.changes @@ -21,6 +21,12 @@ Sat Oct 10 12:10:59 UTC 2015 - lars@linux-schulserver.de + Fix ansible-galaxy and the hipchat callback plugin to check that the host it is contacting matches its TLS Certificate. +------------------------------------------------------------------- +Sat Sep 26 14:01:30 UTC 2015 - m0ses@samaxi.de + +- Added fix_zypper_errorhandling.patch as it`s have not been accepted + upstream, in lack of an reviewer. See patch for more comments + ------------------------------------------------------------------- Fri Sep 11 16:10:12 UTC 2015 - robin.roth@kit.edu diff --git a/ansible.spec b/ansible.spec index 78147eb..fc6f465 100644 --- a/ansible.spec +++ b/ansible.spec @@ -27,6 +27,8 @@ Group: Development/Languages/Python Url: http://ansible.com/ Source: https://pypi.python.org/packages/source/a/ansible/ansible-%{version}.tar.gz Source99: ansible-rpmlintrc +Patch0: fix_zypper_errorhandling.patch + %if 0%{?suse_version} %if 0%{?suse_version} >= 01130 BuildRequires: python-paramiko @@ -78,6 +80,7 @@ like zero downtime rolling updates with load balancers. %prep %setup -q -n ansible-%{version} +%patch0 -p1 %build python setup.py build diff --git a/fix_zypper_errorhandling.patch b/fix_zypper_errorhandling.patch new file mode 100644 index 0000000..801d812 --- /dev/null +++ b/fix_zypper_errorhandling.patch @@ -0,0 +1,16 @@ +diff --git a/lib/ansible/modules/extras/packaging/os/zypper.py b/lib/ansible/modules/extras/packaging/os/zypper.py +index 196a7e2..7f63482 100644 +--- a/lib/ansible/modules/extras/packaging/os/zypper.py ++++ b/lib/ansible/modules/extras/packaging/os/zypper.py +@@ -192,6 +192,11 @@ def package_latest(m, name, installed_state, disable_gpg_check, disable_recommen + cmd.extend(name) + rc, stdout, stderr = m.run_command(cmd, check_rc=False) + ++ # return if an error occured while installation ++ # otherwise error messages will be lost and user doesn`t see any error ++ if rc: ++ return (rc, stdout, stderr, changed) ++ + # if we've already made a change, we don't have to check whether a version changed + if not changed: + post_upgrade_versions = get_current_version(m, name)