search for: __include

...rameters to the podwrapper command is not very easy to use because it involves modifying the Makefile.am in every place where this is used, plus under po-docs/$language/Makefile.am. It's better if the POD file itself can do the inclusion. This enhances support so that the special sequences __INCLUDE:file.pod__ or __VERBATIM:file.txt__ are treated as file inclusion. The filename must be a plain file and is searched along a path (supplied by the optional podwrapper --path parameter). The purpose of the path is to allow translations to happen more easily. For example we can include a part...

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 po-docs/$language. The third patch unifies the --key SELECT...

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.

On Tuesday, 26 November 2019 19:13:21 CET Richard W.M. Jones wrote: > +my $path; > + > +=item B<--path DIR[:DIR...]> > + > +Set the path used for searching for included files (see L</POD FORMAT> > +above). The current directory is always searched first so you don’t > +need to add that explicitly. I believe we can improve the handling of this option, for example

...3f500fde 100644 --- a/align/virt-alignment-scan.pod +++ b/align/virt-alignment-scan.pod @@ -162,6 +162,8 @@ If you have untrusted raw-format guest disk images, you should use this option to specify the disk format. This avoids a possible security problem with malicious guests (CVE-2010-3851). +__INCLUDE:blocksize-option.pod__ + =item B<-P> nr_threads Since libguestfs 1.22, virt-alignment-scan is multithreaded and diff --git a/cat/Makefile.am b/cat/Makefile.am index 1d013e8dd..01e13abda 100644 --- a/cat/Makefile.am +++ b/cat/Makefile.am @@ -200,6 +200,7 @@ stamp-virt-filesystems.pod: virt...

From: Nikolay Ivanets <stenavin@gmail.com> This patch depends on changes in 'common' sub-module posted here: https://www.redhat.com/archives/libguestfs/2020-February/msg00099.html v2: Almost the same as v1 except '--blocksize' option description is moved into a common submodule (similar to key-option.pod). v1 was here:

...pod b/align/virt-alignment-scan.pod index 19953546e..83645f4d0 100644 --- a/align/virt-alignment-scan.pod +++ b/align/virt-alignment-scan.pod @@ -121,6 +121,8 @@ force a particular format use the I<--format=..> option. Add a remote disk. See L<guestfish(1)/ADDING REMOTE STORAGE>. +__INCLUDE:blocksize-option.pod__ + =item B<-c> URI =item B<--connect> URI diff --git a/cat/Makefile.am b/cat/Makefile.am index 1d013e8dd..01e13abda 100644 --- a/cat/Makefile.am +++ b/cat/Makefile.am @@ -200,6 +200,7 @@ stamp-virt-filesystems.pod: virt-filesystems.pod $(PODWRAPPER) \ --m...

From: Nikolay Ivanets <stenavin@gmail.com> This patch depends on changes in 'common' sub-module posted here: https://www.redhat.com/archives/libguestfs/2020-February/msg00150.html v3 fixes issue found during code review: - options now appear in alphabetical order v2: Almost the same as v1 except '--blocksize' option description is moved into a common submodule (similar to

...=> \@inserts, + "path=s" => \@paths, "verbatim=s" => \@verbatims, ) or pod2usage (2); pod2usage (1) if $help; @@ -117,6 +127,10 @@ foreach (@inserts) { if $content eq $oldcontent; } +# Perform INCLUDE directives. +$content =~ s{__INCLUDE:([-a-z0-9_]+\.pod)__} + {read_whole_file ("$1", use_path => 1)}ge; + # Perform @verbatims. foreach (@verbatims) { my @a = split /:/, $_, 2; @@ -128,6 +142,10 @@ foreach (@verbatims) { if $content eq $oldcontent; } +# Perform VERBATIM directives. +$content...

I've fixed this specific error in r164813. Please let me know if there are more behind it. On Thu, Sep 27, 2012 at 2:16 PM, Sid Manning <sidneym at codeaurora.org> wrote: > > I just updated my llvm sources (revision 164794.) and I see the error, > "overriding non-deleted function" when building with gcc 4.7.0 and passing > -std=c++11. > >

I just updated my llvm sources (revision 164794.) and I see the error, "overriding non-deleted function" when building with gcc 4.7.0 and passing -std=c++11. /usr2/sidneym/llvm/tools/install/bin/c++ -D_GNU_SOURCE -D_DEBUG -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS -std=c++11 -fPIC -fvisibility-inlines-hidden -I/local/scratch/llvm-tmp/build/lib/VMCore

...ts the sector size of the disk image. Similar to +I<--format> option it affects all subsequent I<-a> options. Using +I<--blocksize> with no argument switches disk sector size to the +default value which usually 512 bytes. See also +L<guestfs(3)/guestfs_add_drive_opts>. + __INCLUDE:key-option.pod__ =item B<--keys-from-stdin> diff --git a/cat/virt-filesystems.pod b/cat/virt-filesystems.pod index a3a0fb29a..8183754d7 100644 --- a/cat/virt-filesystems.pod +++ b/cat/virt-filesystems.pod @@ -195,6 +195,18 @@ If you have untrusted raw-format guest disk images, you should u...

From: Nikolay Ivanets <stenavin@gmail.com> This patch depends on changes in 'common' sub-module posted here: https://www.redhat.com/archives/libguestfs/2020-February/msg00096.html Nikolay Ivanets (1): tools: add '--blocksize' option for C-based tools align/scan.c | 8 ++++++++ align/virt-alignment-scan.pod | 12 ++++++++++++ cat/cat.c