[PATCH 22/24] nwfilterxml2firewalldata: Use internal wrapping to wrap output files

Pavel Hrdina phrdina at redhat.com
Wed Apr 7 18:15:13 UTC 2021


On Wed, Apr 07, 2021 at 07:42:56PM +0200, Peter Krempa wrote:
> On Wed, Apr 07, 2021 at 19:27:31 +0200, Pavel Hrdina wrote:
> > On Wed, Apr 07, 2021 at 05:09:45PM +0200, Peter Krempa wrote:
> > > As with previous commits use virCommandSetDryRun to invoke
> > > virCommandToString so that it returns pre-wrapped string.
> > > 
> > > Since virCommand is better aware of where the arguments terminate we can
> > > see an improvement where comments are no longer line-wrapped.
> > > 
> > > The changes to the 'commonRules' strings were done with the following
> > > regex:
> > > 
> > >  s/ -/ \\\\\\n-/
> > > 
> > > Signed-off-by: Peter Krempa <pkrempa at redhat.com>
> > > ---
> > >  build-aux/syntax-check.mk                     |   2 +-
> > >  .../comment-linux.args                        |   9 +-
> > >  .../target-linux.args                         |  81 ++++------
> > >  tests/nwfilterxml2firewalltest.c              | 148 +++++++++---------
> > >  4 files changed, 105 insertions(+), 135 deletions(-)
> > > 
> > > diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk
> > > index 1c2ea1c98a..bfff8abece 100644
> > > --- a/build-aux/syntax-check.mk
> > > +++ b/build-aux/syntax-check.mk
> > > @@ -1713,7 +1713,7 @@ sc_header-ifdef:
> > >  	$(PYTHON) $(top_srcdir)/scripts/header-ifdef.py
> > > 
> > >  sc_test-wrap-argv:
> > > -	$(AM_V_GEN)$(VC_LIST) | $(GREP) -v -E 'qemuxml2argvdata' \
> > > +	$(AM_V_GEN)$(VC_LIST) | $(GREP) -v -E 'qemuxml2argvdata|nwfilterxml2firewalldata' \
> > >  	|$(GREP) -E '\.(ldargs|args)' | $(RUNUTF8) xargs \
> > >  	$(PYTHON) $(top_srcdir)/scripts/test-wrap-argv.py --check
> > 
> > This hunk fails to apply, looking at the patch series and master branch
> > the removed code should look like this:
> > 
> > sc_test-wrap-argv:
> >     $(AM_V_GEN)$(VC_LIST) | $(GREP) -E '\.(ldargs|args)' | $(RUNUTF8) xargs \
> >     $(PYTHON) $(top_srcdir)/scripts/test-wrap-argv.py --check
> 
> For some weird reason patch 17/24 didn't arrive to the list yet, that is
> adding the qemuxml2argv bit.

Right, I did not notice that it is missing.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/libvir-list/attachments/20210407/2e73c34a/attachment-0001.sig>


More information about the libvir-list mailing list