From: Mike Frysinger Date: Tue, 19 Feb 2008 05:14:08 +0000 (+0000) Subject: Do not abort if @DESCRIPTION is not set #209665 by mren. X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=19480953fbde43dd2ae66efc3dbdb844d5586458;p=gentoo.git Do not abort if @DESCRIPTION is not set #209665 by mren. Package-Manager: portage-2.2_pre2 --- diff --git a/app-portage/eclass-manpages/ChangeLog b/app-portage/eclass-manpages/ChangeLog index 2659da3a80f4..eaca4b597687 100644 --- a/app-portage/eclass-manpages/ChangeLog +++ b/app-portage/eclass-manpages/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-portage/eclass-manpages -# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/eclass-manpages/ChangeLog,v 1.8 2007/09/01 03:49:05 vapier Exp $ +# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-portage/eclass-manpages/ChangeLog,v 1.9 2008/02/19 05:14:07 vapier Exp $ + + 19 Feb 2008; Mike Frysinger + files/eclass-to-manpage.awk: + Do not abort if @DESCRIPTION is not set #209665 by mren. 01 Sep 2007; Mike Frysinger files/eclass-to-manpage.awk: diff --git a/app-portage/eclass-manpages/Manifest b/app-portage/eclass-manpages/Manifest index a7070c277513..0ca9a143012e 100644 --- a/app-portage/eclass-manpages/Manifest +++ b/app-portage/eclass-manpages/Manifest @@ -1,4 +1,14 @@ -AUX eclass-to-manpage.awk 6204 RMD160 10b6469178fea62a8829a92062dd0845313dd04f SHA1 a98df40bc5d00bbc545bed89c797f43de1810641 SHA256 260ac8b6e17f247c43e5379d7cadbba7bc48521ca6f7b35fe820e5753c9885ec -EBUILD eclass-manpages-20070615.ebuild 722 RMD160 f5482fa608bfacef0e1cf1e8b804d27127f90466 SHA1 48a42ffbbd4a396520c4ea007ee742d2d88532ed SHA256 fe7eec2d0d6e16dc6409a0a4c1939d389bac4570bb0f49dacf7073f4695e297c -MISC ChangeLog 1252 RMD160 69f0af28f76abfefd7c820c33f551203016654e8 SHA1 3b6da6e66040585e10fdca87155d506d6a7351bd SHA256 5cf9b8555cfd086894131854d252df994b2be401a32d14304785ea6e243f466c +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX eclass-to-manpage.awk 6170 RMD160 ee5e8ee21a8a23097f78c16862048272cf9b3599 SHA1 fb98b053531a27bace38e39bd4d8f1a853e5dbe4 SHA256 67c31362f5ddda7d6a6f16f7d319a48273861018e59389b20264257b64680268 +EBUILD eclass-manpages-20070615.ebuild 740 RMD160 939ed170d1f55911c0f96e13669df485c233d7cf SHA1 b7efb6a89bf00793197d517da14656e690d62c6a SHA256 218a3279cd67408e3d1b9801c2500db98f3e24254d3e85744f3894609a4b6b06 +MISC ChangeLog 1393 RMD160 bab50beb13c7470644cbbefc1011dd060a9c894c SHA1 b3786906b9ba62560ab752030c99711871927c7f SHA256 5f42e2d3ceef88af646aa5bb413ae85448febc1133e6d484dc2e04d9d43ab105 MISC metadata.xml 221 RMD160 c7e790cc8c28f4ca9133ba2b338459529c36c860 SHA1 c80a886ceee34829b6f6672b8151150aa32cd5fa SHA256 c14f949c7f32e005a8d6f8acf812b48f7e2b6c4f4b67339fb9b9127fd6e17f3f +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.7 (GNU/Linux) + +iD8DBQFHumWmj9hvisErhMIRAlg9AJ9oWYsP+vzmkugJg9O20+UXVxTjgwCghwbM +Aswe/n8cOMkL/NdHCvNX6dA= +=+2e2 +-----END PGP SIGNATURE----- diff --git a/app-portage/eclass-manpages/files/eclass-to-manpage.awk b/app-portage/eclass-manpages/files/eclass-to-manpage.awk index a406afbbd057..fd9a1260d85c 100644 --- a/app-portage/eclass-manpages/files/eclass-to-manpage.awk +++ b/app-portage/eclass-manpages/files/eclass-to-manpage.awk @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/eclass-manpages/files/eclass-to-manpage.awk,v 1.11 2007/09/01 21:31:39 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/eclass-manpages/files/eclass-to-manpage.awk,v 1.12 2008/02/19 05:14:08 vapier Exp $ # This awk converts the comment documentation found in eclasses # into man pages for easier/nicer reading. @@ -122,8 +122,10 @@ function handle_eclass() { # finally display it print ".SH \"NAME\"" print eclass " \\- " man_text(blurb) - print ".SH \"DESCRIPTION\"" - print man_text(desc) + if (desc != "") { + print ".SH \"DESCRIPTION\"" + print man_text(desc) + } if (example != "") { print ".SH \"EXAMPLE\"" print man_text(example) @@ -132,8 +134,6 @@ function handle_eclass() { # sanity checks if (blurb == "") fail(eclass ": no @BLURB found") - if (desc == "") - fail(eclass ": no @DESCRIPTION found") if (eclass_maintainer == "") warn(eclass ": no @MAINTAINER found")