On Wed, Jan 13, 2016 at 09:41:56PM +0100, Daniel Jakots wrote:
> > share/examples/ansible/
> > -@sample ${SYSCONFDIR}/ansible/
> > share/examples/ansible/ansible.cfg
> > -@sample ${SYSCONFDIR}/ansible/ansible.cfg
> > share/examples/ansible/hosts
> > -@sample ${SYSCONFDIR}/ansible/hosts
>
> I don't think that should change.
Thanks for pointing that out, I fixed it in the attached patch.
On Wed, Jan 13, 2016 at 09:17:21PM +, Stuart Henderson wrote:
> Please CC rpe@ (maintainer) :)
Sorry, didn't know that. I'll do so from now on.
>
> And since this just moved from the following patch, please copy across the
> comment:
>
> > -$OpenBSD: patch-lib_ansible_runner_action_plugins_copy_py,v 1.1 2014/09/10
> > 20:21:43 rpe Exp $
> > -
> > -https://github.com/adamchainz/ansible/commit/842a1b976d650b2c3117a6e0ed1329e5d0d62873
> > -
> > -'copy' write new line at end of file if 'content' passed without newline
> ^^
Had overlooked the comment. I re-added it in the attached patch.
Thanks!
Frank
? ansible-2.0.0.1.diff
Index: Makefile
===
RCS file: /cvs/ports/sysutils/ansible/Makefile,v
retrieving revision 1.46
diff -u -p -r1.46 Makefile
--- Makefile25 Oct 2015 15:23:03 - 1.46
+++ Makefile14 Jan 2016 11:05:00 -
@@ -2,7 +2,7 @@
COMMENT = ssh based config management framework
-MODPY_EGG_VERSION =1.9.4
+MODPY_EGG_VERSION =2.0.0.1
DISTNAME = ansible-${MODPY_EGG_VERSION}
CATEGORIES = sysutils
Index: distinfo
===
RCS file: /cvs/ports/sysutils/ansible/distinfo,v
retrieving revision 1.34
diff -u -p -r1.34 distinfo
--- distinfo25 Oct 2015 15:23:03 - 1.34
+++ distinfo14 Jan 2016 11:05:00 -
@@ -1,2 +1,2 @@
-SHA256 (ansible-1.9.4.tar.gz) = lywvrOSfFXe9D/eYlEC/4oIOZvsQ11eZFcxTa8z6b+M=
-SIZE (ansible-1.9.4.tar.gz) = 937120
+SHA256 (ansible-2.0.0.1.tar.gz) = EIXB+uO1n45VpkuUlInx3c2BGgwy2d+KwYq/RKQw87U=
+SIZE (ansible-2.0.0.1.tar.gz) = 1524249
Index: patches/patch-lib_ansible_plugins_action_copy_py
===
RCS file: patches/patch-lib_ansible_plugins_action_copy_py
diff -N patches/patch-lib_ansible_plugins_action_copy_py
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-lib_ansible_plugins_action_copy_py14 Jan 2016 11:05:00
-
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+https://github.com/adamchainz/ansible/commit/842a1b976d650b2c3117a6e0ed1329e5d0d62873
+
+'copy' write new line at end of file if 'content' passed without newline
+
+--- lib/ansible/plugins/action/copy.py.origWed Jan 13 21:13:56 2016
lib/ansible/plugins/action/copy.py Wed Jan 13 21:14:39 2016
+@@ -299,6 +299,8 @@ class ActionModule(ActionBase):
+ content = to_bytes(content)
+ try:
+ f.write(content)
++if not content.endswith('\n'):
++ f.write('\n')
+ except Exception as err:
+ os.remove(content_tempfile)
+ raise Exception(err)
Index: patches/patch-lib_ansible_runner_action_plugins_copy_py
===
RCS file: patches/patch-lib_ansible_runner_action_plugins_copy_py
diff -N patches/patch-lib_ansible_runner_action_plugins_copy_py
--- patches/patch-lib_ansible_runner_action_plugins_copy_py 10 Sep 2014
20:21:43 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,17 +0,0 @@
-$OpenBSD: patch-lib_ansible_runner_action_plugins_copy_py,v 1.1 2014/09/10
20:21:43 rpe Exp $
-
-https://github.com/adamchainz/ansible/commit/842a1b976d650b2c3117a6e0ed1329e5d0d62873
-
-'copy' write new line at end of file if 'content' passed without newline
-
lib/ansible/runner/action_plugins/copy.py.orig Wed Sep 10 21:24:52 2014
-+++ lib/ansible/runner/action_plugins/copy.py Wed Sep 10 21:25:00 2014
-@@ -315,6 +315,8 @@ class ActionModule(object):
- f = os.fdopen(fd, 'w')
- try:
- f.write(content)
-+if not content.endswith('\n'):
-+f.write('\n')
- except Exception, err:
- os.remove(content_tempfile)
- raise Exception(err)
Index: pkg/PLIST
===
RCS file: /cvs/ports/sysutils/ansible/pkg/PLIST,v
retrieving revision 1.16
diff -u -p -r1.16 PLIST
--- pkg/PLIST 1 Jul 2015 21:26:38 - 1.16
+++ pkg/PLIST 14 Jan 2016 11:05:00 -
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.16 2015/07/01 21:26:38 rpe Exp $
+@comment $OpenBSD$
bin/ansible
bin/ansible-doc
bin/ansible-galaxy
@@ -20,32 +20,86 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/ansible.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/ansible/__init__.py
lib/python${MODPY_VERSION}/site-packages/ansible/__init__.pyc