Date: Tue, 12 Dec 2017 17:01:51 +0000 From: Glen Barber <gjb@FreeBSD.org> To: Wolfram Schneider <wosch@freebsd.org> Cc: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: Re: svn commit: r51260 - in head: en_US.ISO8859-1/htdocs/doc share/pgpkeys Message-ID: <20171212170151.GL17600@FreeBSD.org> In-Reply-To: <CAMWY7CCtTay0-Tpr9DNgvyN_xE%2B9pxf-xSxXwNeZ7vryoHKfeg@mail.gmail.com> References: <201712061850.vB6IoXbm056341@repo.freebsd.org> <CAMWY7CBUsZJF=WqVGUdMBJog7xyG%2BKJoTmHhdZ--6Q0Tt3O16A@mail.gmail.com> <20171212141917.GJ17600@FreeBSD.org> <CAMWY7CCtTay0-Tpr9DNgvyN_xE%2B9pxf-xSxXwNeZ7vryoHKfeg@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--nrM5Z5VIJgwP9LWp Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Dec 12, 2017 at 05:43:52PM +0100, Wolfram Schneider wrote: > On 12 December 2017 at 15:19, Glen Barber <gjb@freebsd.org> wrote: > > On Tue, Dec 12, 2017 at 01:17:11PM +0100, Wolfram Schneider wrote: > >> On 6 December 2017 at 19:50, Glen Barber <gjb@freebsd.org> wrote: > >> > Author: gjb > >> > Date: Wed Dec 6 18:50:32 2017 > >> > New Revision: 51260 > >> > URL: https://svnweb.freebsd.org/changeset/doc/51260 > >> > > >> > Log: > >> > Fix generating pgpkeyring.txt when it does not exist, which seems > >> > to have been broken following r51076 or r51077. > >> > >> What do you mean with 'Fix generating pgpkeyring.txt when it does not = exist'? > >> > >> The file pgpkeyring.txt will be created while building the English > >> docs for the web site: > >> > >> $ make -C en_US.ISO8859-1/htdocs all > >> > >> and then you will have the file > >> doc/share/pgpkeys/pgpkeyring.txt > >> > >> Your commit breaks `make -j' (parallel build) > >> > >> $ make -j32 p-all > >> > >> =3D=3D=3D> articles/bsdl-gpl (all) > >> keyring.xml:16385: parser error : CData section not finished > >> > >> -----BEGIN PGP PUBLIC KEY BLOCK----- > >> mQINBFJCuag > >> --- all_subdir_books/handbook --- > >> =3D=3D=3D> books/handbook (all) > >> --- all_subdir_articles/contributing --- > >> =3D=3D=3D> articles/contributing (all) > >> 1Ss13Y8Vf5UxzEvY8O8c4lT4XOVQLuDEZn7nUcmMBr+b0haGwTW1lrQv1DvPEo0 > >> ^ > >> > >> keyring.xml:16385: parser error : Premature end of data in tag > >> programlisting line 16087 > >> 1Ss13Y8Vf5UxzEvY8O8c4lT4XOVQLuDEZn7nUcmMBr+b0haGwTW1lrQv1DvPEo0 > >> ^ > >> > >> keyring.xml:16385: parser error : Premature end of data in tag keyring= line 2 > >> 1Ss13Y8Vf5UxzEvY8O8c4lT4XOVQLuDEZn7nUcmMBr+b0haGwTW1lrQv1DvPEo0 > >> ^ > >> > >> unable to parse keyring.xml > >> *** [pgpkeyring] Error code 6 > >> > >> make[2]: stopped in /tmp/doc-build.PU3aNQj/doc/share/pgpkeys > >> A failure has been detected in another branch of the parallel make > >> > > > > Prior to this change pgpkeyring.txt was never created, and as such > > failed to install. I checked the timestamp of the file on the build > > machine in the cluster, and confirmed it was not being generated there > > as well, eliminating a local issue. > > > > install -C -o gjb -g gjb -m 444 imagelib/callouts/21.png /home/gjb/pu= blic_html/FreeBSD/data/doc/en_US.ISO8859-1/books/porters-handbook/imagelib/= callouts > > /home/gjb/public_html/FreeBSD/data/doc/en_US.ISO8859-1/books/porters-ha= ndbook/handbook.html -> /home/gjb/public_html/FreeBSD/data/doc/en_US.ISO885= 9-1/books/porters-handbook/index.html > > /home/gjb/public_html/FreeBSD/data/doc/faq -> /home/gjb/public_html/Fre= eBSD/data/doc/en_US.ISO8859-1/books/faq > > /home/gjb/public_html/FreeBSD/data/doc/handbook -> /home/gjb/public_htm= l/FreeBSD/data/doc/en_US.ISO8859-1/books/handbook > > /home/gjb/public_html/FreeBSD/data/doc/en -> /home/gjb/public_html/Free= BSD/data/doc/en_US.ISO8859-1 > > cp -f /freebsd/doctemp/share/pgpkeys/pgpkeyring.txt /home/gjb/public_ht= ml/FreeBSD/data/doc/pgpkeyring.txt > > cp: /freebsd/doctemp/share/pgpkeys/pgpkeyring.txt: No such file or dire= ctory > > *** Error code 1 > > > > Stop. > > make[1]: stopped in /freebsd/doctemp/en_US.ISO8859-1/htdocs/doc > > *** Error code 1 >=20 > Did you run 'make all' before 'make install'? >=20 > You must run "all" before "install". Install does not build files, it > will install them only. > "install" assume that you run the "all" target before, it will not run > "all" automatically. >=20 > I did a quick test and I see that pgpkeyring.txt was generated prior > to your commit: >=20 > git clone -q https://github.com/freebsd/freebsd-doc doc > cd doc; git checkout 182028aed582df013ac090340325eff65a6f8e4e > ENGLISH_ONLY=3DYES time make -C en_US.ISO8859-1/htdocs all >& all.log >=20 > real 3m30.506s > user 3m4.873s > sys 0m27.697s >=20 > find . -name 'pgp*.txt' > ./share/pgpkeys/pgpkeyring.txt >=20 > and > time make -C en_US.ISO8859-1/htdocs install >& install.log >=20 > will install pgpkeyring.txt in ~/public_html/data/doc/pgpkeyring.txt >=20 It did not for me. I used the 'p-all' target when discovering this. Glen --nrM5Z5VIJgwP9LWp Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEjRJAPC5sqwhs9k2jAxRYpUeP4pMFAlowC38ACgkQAxRYpUeP 4pPxdQ//SBnNKTNNN2DsSavvUnr1QDKnB1q2VI+IE2rBeTfweUgHwXQ4igEYWTzU QSADw92ZGJcDeICO+zIz2Rfft1xh9iJqwed1Jh/1LNb89Z2+2TtPDZHU4CcZ/+6G 8tm4R74hGpa4uPLlfjBxB10bs+3E3F0usnT6IpxtjvMhL8C6Bi1AYhDk5heERxu2 bcLARNmETRw/CyuFrVtdvLqrm4pbMRGgw3qFWON/sFzFogKnt8/I0BzbeARcQPgF NU/8jtLTJIC5QpF8duAFNyNdbWGhADQVLKLCk9oAwVZSCuS3jr5PZpx/aHYWsGlr lJ6upASwebYDbdjrJsnLxON8OIlVA0rlrGuQQ6MfLRNhQRb+oej9CK3WYIW3CJhR Bf8W3Vj4/5IPMdJ3M4bHgJtYKpb3zKTOkXlRmsTKVFkSlAH4eagHyfTocfdxic5E TnlePGY3plym1NJb+cdoFnmVwKfRhTz9iyLaAeIGAiTD5wvte1//liN/6A235c4J ZVZmihHMQARLS90B/OhJ2qxvtKVrH96wODhBbyNeEYIrCg0aJxCTz72KD9G2MoBO wYSDE/Ml1oW5Tijq4dsh/pMaHkhrLp2x5ZgEcgJS5QI/EHgnhJ28VKDS+oEsfu8e +3Kk44f09yTxaiwF0OcrlBQbuQ/nT8KW+3Q2yPqsNrG2BZWo+Js= =fbvk -----END PGP SIGNATURE----- --nrM5Z5VIJgwP9LWp--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20171212170151.GL17600>