From 0e2d2f39634416cf82c5d8c9a40c75c7c660db66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= Date: Mon, 15 Feb 2016 11:28:25 +0000 Subject: [PATCH 1/2] Accepting request 359109 from home:rainbowtux:branches:systemsmanagement Hopefully I got all ducks in a row now, if not please let me know how I can improve the submission. Thanks a lot! OBS-URL: https://build.opensuse.org/request/show/359109 OBS-URL: https://build.opensuse.org/package/show/systemsmanagement/ansible?expand=0&rev=57 --- ansible-1.9.4.tar.gz | 3 --- ansible-2.0.0.2.tar.gz | 3 +++ ansible-rpmlintrc | 2 +- ansible.changes | 11 +++++++++++ ansible.spec | 24 ++++++++---------------- fix_zypper_errorhandling.patch | 16 ---------------- 6 files changed, 23 insertions(+), 36 deletions(-) delete mode 100644 ansible-1.9.4.tar.gz create mode 100644 ansible-2.0.0.2.tar.gz delete mode 100644 fix_zypper_errorhandling.patch diff --git a/ansible-1.9.4.tar.gz b/ansible-1.9.4.tar.gz deleted file mode 100644 index 2ba6982..0000000 --- a/ansible-1.9.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:972c2face49f1577bd0ff7989440bfe2820e66fb10d7579915cc536bccfa6fe3 -size 937120 diff --git a/ansible-2.0.0.2.tar.gz b/ansible-2.0.0.2.tar.gz new file mode 100644 index 0000000..d32a839 --- /dev/null +++ b/ansible-2.0.0.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:27db0b99113fab85b1430c361c7790a0aa7f5c614c9af13362e2adbba07e5828 +size 1497944 diff --git a/ansible-rpmlintrc b/ansible-rpmlintrc index 26e632c..beb65d5 100644 --- a/ansible-rpmlintrc +++ b/ansible-rpmlintrc @@ -1,4 +1,4 @@ # Modules are scripts by definition but are executed from ansible not directly addFilter("non-executable-script.*/usr/lib/python.*/site-packages/ansible/modules/.*"); # same as utils and runner script -addFilter("non-executable-script.*/usr/lib/python.*/site-packages/ansible/(runner|utils)/.*.py"); +addFilter("non-executable-script.*/usr/lib/python.*/site-packages/ansible/(cli|galaxy|module_utils|plugins/action|runner|utils)/.*.py"); diff --git a/ansible.changes b/ansible.changes index 44c7c1b..28a9a92 100644 --- a/ansible.changes +++ b/ansible.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Feb 11 10:44:40 UTC 2016 - erwin.vandevelde@gmail.com + +- update to 2.0.0.2 + Version 2.0 is a new major version with a lot of changes, among which: + + New modules for cloud-based services and many more + + The new block/rescue/always directives allow for making task blocks and exception-like semantics + + Many API changes +- more info at: + https://github.com/ansible/ansible/blob/devel/CHANGELOG.md#20-over-the-hills-and-far-away + ------------------------------------------------------------------- Sun Oct 11 16:11:02 UTC 2015 - lars@linux-schulserver.de diff --git a/ansible.spec b/ansible.spec index fc6f465..04ac765 100644 --- a/ansible.spec +++ b/ansible.spec @@ -19,7 +19,7 @@ Name: ansible -Version: 1.9.4 +Version: 2.0.0.2 Release: 0 Summary: Radically simple IT automation License: GPL-3.0 @@ -27,7 +27,6 @@ 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 @@ -80,24 +79,19 @@ like zero downtime rolling updates with load balancers. %prep %setup -q -n ansible-%{version} -%patch0 -p1 %build python setup.py build %install python setup.py install --prefix=%{_prefix} --root=%{buildroot} -for manfile in man1/ansible.1 man1/ansible-doc.1 \ - man1/ansible-galaxy.1 man1/ansible-playbook.1 \ - man1/ansible-pull.1 man1/ansible-vault.1 -do - install -Dm 0644 docs/man/${manfile} %{buildroot}%{_mandir}/${manfile} -done -# Default configuration not really required by default. -install -Dm 0644 examples/ansible.cfg %{buildroot}%{_sysconfdir}/ansible/ansible.cfg.example -install -Dm 0644 examples/ansible.cfg %{buildroot}%{_sysconfdir}/ansible/ansible.cfg -install -Dm 0644 examples/hosts %{buildroot}%{_sysconfdir}/ansible/hosts.example -install -Dm 0644 examples/hosts %{buildroot}%{_sysconfdir}/ansible/hosts + +mkdir -p %{buildroot}/etc/ansible/ +cp examples/hosts %{buildroot}/etc/ansible/ +cp examples/ansible.cfg %{buildroot}/etc/ansible/ +mkdir -p %{buildroot}/%{_mandir}/man1/ +cp -v docs/man/man1/*.1 %{buildroot}/%{_mandir}/man1/ +mkdir -p %{buildroot}/%{_datadir}/ansible %files %defattr(-,root,root,-) @@ -117,8 +111,6 @@ install -Dm 0644 examples/hosts %{buildroot}%{_sysconfdir}/ansible/hosts %{_mandir}/man1/ansible-vault.1* %dir %{_sysconfdir}/ansible %config(noreplace) %{_sysconfdir}/ansible/ansible.cfg -%config %{_sysconfdir}/ansible/ansible.cfg.example %config(noreplace) %{_sysconfdir}/ansible/hosts -%config %{_sysconfdir}/ansible/hosts.example %changelog diff --git a/fix_zypper_errorhandling.patch b/fix_zypper_errorhandling.patch deleted file mode 100644 index 801d812..0000000 --- a/fix_zypper_errorhandling.patch +++ /dev/null @@ -1,16 +0,0 @@ -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) From 263d5d1c8c26a3419012da3b28a9e2c87eb3a016 Mon Sep 17 00:00:00 2001 From: Boris Manojlovic Date: Mon, 15 Feb 2016 23:25:46 +0000 Subject: [PATCH 2/2] Accepting request 359468 from home:evshmarnev:branches:systemsmanagement - fix_zypper_errorhandling.patch is being deleted OBS-URL: https://build.opensuse.org/request/show/359468 OBS-URL: https://build.opensuse.org/package/show/systemsmanagement/ansible?expand=0&rev=58 --- ansible.changes | 5 +++++ ansible.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ansible.changes b/ansible.changes index 28a9a92..4340e49 100644 --- a/ansible.changes +++ b/ansible.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Feb 15 13:23:26 UTC 2016 - eshmarnev@suse.com + +- fix_zypper_errorhandling.patch is being deleted + ------------------------------------------------------------------- Thu Feb 11 10:44:40 UTC 2016 - erwin.vandevelde@gmail.com diff --git a/ansible.spec b/ansible.spec index 04ac765..871f191 100644 --- a/ansible.spec +++ b/ansible.spec @@ -1,7 +1,7 @@ # # spec file for package ansible # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright 2013 by Lars Vogdt # Copyright 2014 by Boris Manojlovic #