From 203f4df1e0e2c4ecd5d17ce622425eadac663963 Mon Sep 17 00:00:00 2001 From: Dag Wieers Date: Fri, 9 Nov 2012 02:19:22 +0100 Subject: [PATCH] Documentation of svr4pkg module breaks 'make rpm' Without this fix, generating documentation results in: ``` Traceback (most recent call last): File "hacking/module_formatter.py", line 376, in main() File "hacking/module_formatter.py", line 365, in main text = template.render(doc) File "/usr/lib64/python2.6/site-packages/jinja2/environment.py", line 669, in render return self.environment.handle_exception(exc_info, True) File "hacking/templates/man.j2", line 20, in top-level template code {% for desc in v.description %}@{ desc | jpfunc }@{% endfor %} File "hacking/module_formatter.py", line 94, in man_ify t = _ITALIC.sub(r'\\fI' + r"\1" + r"\\fR", text) TypeError: expected string or buffer ``` --- svr4pkg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/svr4pkg b/svr4pkg index 7c776d3f923..5735a7bc160 100644 --- a/svr4pkg +++ b/svr4pkg @@ -48,7 +48,7 @@ options: src: description: - Specifies the location to install the package from. Required when C(state=present). - - Can be any path acceptable to the C(pkgadd) command's C(-d) option. e.g.: C(somefile.pkg), C(/dir/with/pkgs), C(http:/server/mypkgs.pkg). + - "Can be any path acceptable to the C(pkgadd) command's C(-d) option. e.g.: C(somefile.pkg), C(/dir/with/pkgs), C(http:/server/mypkgs.pkg)." - If using a file or directory, they must already be accessible by the host. See the I(copy) module for a way to get them there. proxy: description: @@ -57,7 +57,7 @@ options: examples: - code: svr4pkg name=CSWcommon src=/tmp/cswpkgs.pkg state=present description: Install a package from an already copied file - - code: svr4pkg name=CSWpkgutil src=http://get.opencsw.org/now state=present + - code: 'svr4pkg name=CSWpkgutil src=http://get.opencsw.org/now state=present' description: Install a package directly from an http site - code: svr4pkg name=SUNWgnome-sound-recorder state=absent description: Ensure that a package is not installed.