[libvirt] [PATCH 09/29] remote: conditionalize IP socket config in augeas definitions

[Daniel P. Berrangé]

On Fri, Jul 12, 2019 at 03:37:14PM +0200, Michal Privoznik wrote:
> On 7/11/19 6:04 PM, Daniel P. Berrangé wrote:
> > Prepare for reusing libvirtd augeas defintions with other daemons by
> > making the config parameters for IP sockets conditionally defined by
> > the make rules.
> > 
> > Signed-off-by: Daniel P. Berrangé <berrange at redhat.com>
> > ---
> >   build-aux/augeas-gentest.pl                  |  2 +-
> >   src/remote/Makefile.inc.am                   | 27 +++++++++++++++-----
> >   src/remote/{libvirtd.aug => libvirtd.aug.in} | 24 ++++++++++++-----
> >   src/remote/test_libvirtd.aug.in              | 14 +++++++---
> >   4 files changed, 49 insertions(+), 18 deletions(-)
> >   rename src/remote/{libvirtd.aug => libvirtd.aug.in} (88%)
> > 
> > diff --git a/build-aux/augeas-gentest.pl b/build-aux/augeas-gentest.pl
> > index 567fc651f3..69d94e6a0f 100755
> > --- a/build-aux/augeas-gentest.pl
> > +++ b/build-aux/augeas-gentest.pl
> > @@ -37,7 +37,7 @@ open TEMPLATE, "<", $template or die "cannot read $template: $!";
> >   
> >   my $group = 0;
> >   while (<TEMPLATE>) {
> > -    if (/::CONFIG::/) {
> > +    if (/::\s*CONFIG\s*::/) {
> >           my $group = 0;
> >           print AUGTEST "  let conf = \"";
> >           while (<CONFIG>) {
> > diff --git a/src/remote/Makefile.inc.am b/src/remote/Makefile.inc.am
> > index 4bc71346f2..7732fa744c 100644
> > --- a/src/remote/Makefile.inc.am
> > +++ b/src/remote/Makefile.inc.am
> > @@ -124,11 +124,11 @@ sbin_PROGRAMS += libvirtd
> >   
> >   augeas_DATA += remote/libvirtd.aug

[snip]

> Surprisingly, 'distcheck' fails for me after this because augeas-gentest.pl
> is unable to find libvirtd.conf. What is surprising is that you're not
> touching libvirtd.conf in this patch but the previous one and distcheck
> just works there.

I actually find distcheck failing in the previous patch too. The problem
is that conf_DATA is added to extra dist, to the libvirtd.conf and
the libvirtd.conf.in both get into the tarball. Fixed by using nodist_conf_DATA
instead.

Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|