[systemd-devel] [PATCH] man: fix spacing issue in sd_is_fifo(3)

[Zbigniew Jędrzejewski-Szmek]

On Wed, Jun 26, 2013 at 05:23:02PM +0200, Zbigniew Jędrzejewski-Szmek wrote:
> On Wed, Jun 26, 2013 at 04:15:18PM +0200, Zbigniew Jędrzejewski-Szmek wrote:
> > On Tue, Jun 25, 2013 at 10:04:47AM +0200, Jason St. John wrote:
> > > On Fri, Jun 14, 2013 at 2:40 PM, Zbigniew Jędrzejewski-Szmek
> > > <zbyszek at in.waw.pl> wrote:
> > > > On Wed, Jun 12, 2013 at 09:25:08PM +0200, Jason St. John wrote:
> > > >> From: "Jason St. John" <jstjohn at purdue.edu>
> > > >>
> > > >> Before: libsystemd-daemonpkg-config(1)
> > > >> After: libsystemd-daemon pkg-config(1)
> > > >>
> > > >> This fix is more complicated than it should be due to the consecutive
> > > >> XML elements separated by collapsible whitespace.
> > > >>
> > > >> Merging the lines and separating the XML elements with an en space or a
> > > >> non-breaking space is the only solution that results in one, and only
> > > >> one, space being inserted between them when testing. An em space results
> > > >> in two spaces being inserted.
> > > > Hm, fails for me with:
> > > >
> > > > Traceback (most recent call last):
> > > >   File "../make-directive-index.py", line 284, in make_page
> > > >     _extract_directives(directive_groups, formatting, page)
> > > >   File "../make-directive-index.py", line 172, in _extract_directives
> > > >     t = xml_parse(page)
> > > >   File "/home/zbyszek/src/systemd-master/xml_helper.py", line 30, in <lambda>
> > > >     xml_parse = lambda page: tree.parse(page, _parser)
> > > >   File "lxml.etree.pyx", line 2957, in lxml.etree.parse (src/lxml/lxml.etree.c:59972)
> > > >   File "parser.pxi", line 1533, in lxml.etree._parseDocument (src/lxml/lxml.etree.c:87299)
> > > >   File "parser.pxi", line 1562, in lxml.etree._parseDocumentFromURL (src/lxml/lxml.etree.c:87591)
> > > >   File "parser.pxi", line 1462, in lxml.etree._parseDocFromFile (src/lxml/lxml.etree.c:86631)
> > > >   File "parser.pxi", line 1002, in lxml.etree._BaseParser._parseDocFromFile (src/lxml/lxml.etree.c:83491)
> > > >   File "parser.pxi", line 569, in lxml.etree._ParserContext._handleParseResultDoc (src/lxml/lxml.etree.c:79352)
> > > >   File "parser.pxi", line 650, in lxml.etree._handleParseResult (src/lxml/lxml.etree.c:80249)
> > > >   File "parser.pxi", line 590, in lxml.etree._raiseParseError (src/lxml/lxml.etree.c:79576)
> > > > lxml.etree.XMLSyntaxError: Entity 'ensp' not defined, line 193, column 51
> > > >
> > > > During handling of the above exception, another exception occurred:
> > > >
> > > > Traceback (most recent call last):
> > > >   File "../make-directive-index.py", line 292, in <module>
> > > >     f.write(xml_print(make_page(*sys.argv[2:])))
> > > >   File "../make-directive-index.py", line 286, in make_page
> > > >     raise ValueError("failed to process " + page)
> > > > ValueError: failed to process ../man/sd_is_fifo.xml
> > > >
> > > > lxml is only used if available, make sure to have it installed if you
> > > > want to see it.
> > > >
> > > > Zbyszek
> > > 
> > > I'm unable to replicate the error you're getting, and I have lxml for
> > > both Py2 and Py3 installed on Arch x86_64. Are you able to build this
> > > man page without my patch applied?
> > I just verified that I get the error with both Python 2 & 3 on FC19.
> > It's probably a bug somewhere, but let's not go this route :) Instead
> > simply using a U+A0 (nbsp) character works. Could you apply the same fix
> > to other pages (sd-daemon, sd_booted, sd_get_seats)?
> Actually, I think I'll simply replace all <literal> with <constant>
> for the pkg-config args, because they look bad with quotes. And
> <constant> doesn't have this problem with spacing, so this patch
> can be skipped.
Actually, <constant> *does* have this problem. So... can you remake
the patch so that it touches all the places where this error occurs?

Thanks,
Zbyszek