search for: __prepopts__

...02,9 +102,9 @@ guestfish.1: guestfish.pod guestfish-actions.pod guestfish-commands.pod guestfis --no-strict-checks \ --man $@ \ --license GPLv2+ \ - --insert guestfish-actions.pod:__ACTIONS__ \ - --insert guestfish-commands.pod:__FISH_COMMANDS__ \ - --insert guestfish-prepopts.pod:__PREPOPTS__ \ + --insert $(srcdir)/guestfish-actions.pod:__ACTIONS__ \ + --insert $(srcdir)/guestfish-commands.pod:__FISH_COMMANDS__ \ + --insert $(srcdir)/guestfish-prepopts.pod:__PREPOPTS__ \ $< virt-sysprep.1: virt-sysprep.pod sysprep-extra-options.pod sysprep-operations.pod @@ -112,8 +112,8...

...d guestfish-commands.pod guestfish-prepopts.pod - $(PODWRAPPER) \ - --no-strict-checks \ - --man $@ \ - --license GPLv2+ \ - --insert $(srcdir)/guestfish-actions.pod:__ACTIONS__ \ - --insert $(srcdir)/guestfish-commands.pod:__FISH_COMMANDS__ \ - --insert $(srcdir)/guestfish-prepopts.pod:__PREPOPTS__ \ - $< - -virt-builder.1: virt-builder.pod customize-synopsis.pod customize-options.pod - $(PODWRAPPER) \ - --no-strict-checks \ - --man $@ \ - --license GPLv2+ \ - --insert $(srcdir)/customize-synopsis.pod:__CUSTOMIZE_SYNOPSIS__ \ - --insert $(srcdir)/customize-options.pod:__CUSTOMI...

v1 was here: https://www.redhat.com/archives/libguestfs/2019-November/msg00271.html In v2 I just updated the way paths are handled. Note this series requires the following patch to common which adds the common/options/key-option.pod file: https://www.redhat.com/archives/libguestfs/2019-November/msg00269.html Rich.

The libguestfs part of this change. Also a virt-v2v part will be needed. The first patch adds a new feature to podwrapper so that we can use __INCLUDE:file__ directives within the POD itself (instead of using --insert, and one day replacing that). The second patch shows how this change could be used for the included parts of the guestfish man page, including the non-English pages under

Make sure the pod checker script can deal with the newer additions of podwrapper.pl. Followup of commit 46e59e9535c2fcd1c188464b5249a249f22af1a0. --- podcheck.pl | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/podcheck.pl b/podcheck.pl index 527a2e47d..795fe0e9b 100755 --- a/podcheck.pl +++ b/podcheck.pl @@ -83,6 +83,15 @@ used where the POD includes

....sh +++ b/fish/test-docs.sh @@ -22,7 +22,5 @@ $TEST_FUNCTIONS skip_if_skipped $top_srcdir/podcheck.pl guestfish.pod guestfish \ - --insert $srcdir/guestfish-actions.pod:__ACTIONS__ \ - --insert $srcdir/guestfish-commands.pod:__FISH_COMMANDS__ \ - --insert $srcdir/guestfish-prepopts.pod:__PREPOPTS__ \ + --path $srcdir --path $top_srcdir/common/options \ --ignore=-D diff --git a/fuse/test-docs.sh b/fuse/test-docs.sh index ba2c9c57a..0edc25658 100755 --- a/fuse/test-docs.sh +++ b/fuse/test-docs.sh @@ -21,7 +21,8 @@ set -e $TEST_FUNCTIONS skip_if_skipped -$top_srcdir/podcheck.pl guest...

Fix for: https://bugzilla.redhat.com/show_bug.cgi?id=1293527 Note that patches 2/3 and 3/3 are dependent on each other, ie. applying 2/3 on its own will break the build. So I may combine these when applying the series. Rich.

...anklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +export LANG=C +set -e + +$srcdir/../podcheck.pl guestfish.pod guestfish \ + --insert $srcdir/guestfish-actions.pod:__ACTIONS__ \ + --insert $srcdir/guestfish-commands.pod:__FISH_COMMANDS__ \ + --insert $srcdir/guestfish-prepopts.pod:__PREPOPTS__ \ + --ignore=-D diff --git a/format/Makefile.am b/format/Makefile.am index cc0489b..9951ba1 100644 --- a/format/Makefile.am +++ b/format/Makefile.am @@ -18,6 +18,8 @@ include $(top_srcdir)/subdir-rules.mk EXTRA_DIST = \ + test-virt-format-docs.sh \ + test-virt-format.sh \ virt-format.pod...

There's not going to be an easy way to present this patch. It's huge and interconnected. Anyway, what it does is lay the groundwork for a new tool which I'm calling 'virt-customize'. virt-customize is virt-builder, but without the part where it downloads a template from a respository. Just the part where it customizes the template, that is, installing packages, editing

Previously I posted a work-in-progress preview of this patch series: https://www.redhat.com/archives/libguestfs/2017-February/msg00224.html This is the finished version that updates all of the shell-script based tests. It passes 'make check', 'make check-direct' and 'make check-slow'. Rich.