From ed9b6e7fc38ae4ab62edde639fd7e7108fcc1f9f Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Thu, 24 Nov 2011 00:05:41 +0000 Subject: [PATCH] Add checks for duplicate func/var documentation (copy & paste). Package-Manager: portage-2.2.0_alpha75/cvs/Linux x86_64 --- app-portage/eclass-manpages/ChangeLog | 5 ++++- app-portage/eclass-manpages/Manifest | 12 ++++++------ .../eclass-manpages/files/eclass-to-manpage.awk | 12 +++++++++++- 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/app-portage/eclass-manpages/ChangeLog b/app-portage/eclass-manpages/ChangeLog index fc89710c9a72..4fcfd9e9235e 100644 --- a/app-portage/eclass-manpages/ChangeLog +++ b/app-portage/eclass-manpages/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-portage/eclass-manpages # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/eclass-manpages/ChangeLog,v 1.26 2011/10/17 18:25:13 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/eclass-manpages/ChangeLog,v 1.27 2011/11/24 00:05:41 vapier Exp $ + + 24 Nov 2011; Mike Frysinger files/eclass-to-manpage.awk: + Add checks for duplicate func/var documentation (copy & paste). 17 Oct 2011; Justin Lecher metadata.xml, eclass-manpages-20111014.ebuild: diff --git a/app-portage/eclass-manpages/Manifest b/app-portage/eclass-manpages/Manifest index a2c97400b5c8..4290bc532d27 100644 --- a/app-portage/eclass-manpages/Manifest +++ b/app-portage/eclass-manpages/Manifest @@ -1,16 +1,16 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 +Hash: SHA256 -AUX eclass-to-manpage.awk 8204 RMD160 043c2a4466d3a23f586fc1f3c367d9900799e214 SHA1 e491bad39a75d8d1d04931342881712da5062d45 SHA256 96e217acdbe7c0f96f89bb9552b8c5ba94821c175dd86feffd832ebfb1b12626 +AUX eclass-to-manpage.awk 8606 RMD160 fb6b22340620b6607841371b567bd5ea3e0ca685 SHA1 d9efb4e40c44ee36aad05b2c5c5cfa7aedadfcfb SHA256 5ceb10fcbd266bb8dba584085d25dde25fe939bb712258de5fe4c31aa8072b21 AUX eclass-to-manpage.sh 597 RMD160 29ec9219c6005b016d685ab855931bae09470ef6 SHA1 3d9eb97a47b7a0be9e0edf0a3bfae5c516a7b5ae SHA256 84d6f8e963206ad6797f236e098c8dfceac5b5b40e9d1b6100fea7b3b08872df EBUILD eclass-manpages-20100821.ebuild 817 RMD160 d63cb4db8a6573c3ab312aefa060b01e31b032e8 SHA1 b3fea25208292fad5fe4bfbe1f30b70bd0b3bbee SHA256 1fe3f2214afe2f390270972c209e22a3a3948258cfe42cea4516a99740f0d72c EBUILD eclass-manpages-20111014.ebuild 699 RMD160 3a9844190b36487788b07e6686e63f2b1c53dd1d SHA1 8bff48f463d5799415ed7a47fa11c479336d45c2 SHA256 5eed20902ffb1523ad34874e545b2b2aa756db18ce1d32548e21ff2203dd4a95 -MISC ChangeLog 4034 RMD160 bf6967479b3b5ed91496ed19b0761c9a791596bd SHA1 2d2de38871845a5f98193bfb577675b9cb158bc1 SHA256 6b5c8c6d76418657c129d16bd9cc14fcb56e4b3fde117d7b2b7caa9cdd265c44 +MISC ChangeLog 4182 RMD160 ddf97b99e4cb663ef61bb6e01f4b3e7ff600689c SHA1 06014c741eda3ccf5e10e8bd32ae91e46940a4ac SHA256 3f1bed0a5f141a6c9e09f282e30655c6a557908d064fce7c4ea61515b93348ba MISC metadata.xml 231 RMD160 260d82921532aff55740b1af93852d182cef031c SHA1 cc616ce9caf6d702cd1b5a6d9b7555daa4f5997f SHA256 d1942ddc594a8b56d383049ebc0234831dce962fe751b933e50010d433946b8c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iEYEAREKAAYFAk6ccxkACgkQgAnW8HDreRbZIACgs4sgufUnBlxGC5mAWV+ye0bi -ZS4AoM1nxzm9ziY70n7nzTnE9KnKPRYM -=m6YV +iF4EAREIAAYFAk7NimMACgkQaC/OocHi7JY4uAEAkCgD5T1bgwaJLOvdonW/lldE +1OQ8VkjoRZ/LdN/ACv8A/3+ZLn2saQDMO9/Yx/lT5DE8E0FZGa9jRbB0klRWzv3P +=LJIo -----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 93f3ecd8a5c1..78522fd6fdc1 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-2011 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.24 2011/08/22 04:49:21 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/eclass-manpages/files/eclass-to-manpage.awk,v 1.25 2011/11/24 00:05:41 vapier Exp $ # This awk converts the comment documentation found in eclasses # into man pages for easier/nicer reading. @@ -182,6 +182,11 @@ function handle_function() { internal = 0 desc = "" + # make sure people haven't specified this before (copy & paste error) + if (all_funcs[func_name]) + fail(eclass ": duplicate definition found for function: " func_name) + all_funcs[func_name] = func_name + # grab the docs getline if ($2 == "@USAGE:") @@ -230,6 +235,11 @@ function _handle_variable() { internal = 0 required = 0 + # make sure people haven't specified this before (copy & paste error) + if (all_vars[var_name]) + fail(eclass ": duplicate definition found for variable: " var_name) + all_vars[var_name] = var_name + # grab the optional attributes opts = 1 while (opts) { -- 2.26.2