[libvirt] [PATCH] syntax-check: enforce the no-cvs-keywords prohibition

Jim Meyering jim at meyering.net
Fri Dec 12 17:51:52 UTC 2008


Daniel Veillard <veillard at redhat.com> wrote:
> On Fri, Dec 12, 2008 at 01:38:58PM +0100, Jim Meyering wrote:
>> Here's the change to remove the few remaining CVS $Id$ strings:
>   Looks fine by me, I just hope the translators won't add some back.
> Maybe it's worth adding to syntax-check ?

Good idea.

That made me look for all of them, not just the few
I thought of on the spot.  And running the new check
exposed two more:

    $ make sc_prohibit_cvs_keyword
    docs/Goals:29:$Date$
    python/TODO:8:$Date$
    Makefile.maint: do not use CVS keyword expansion
    make: *** [sc_prohibit_cvs_keyword] Error 1

So this adds the new check and removes the violations:

>From 53a599396ea43acb662cbae811cf1e5bafb2b282 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering at redhat.com>
Date: Fri, 12 Dec 2008 18:48:32 +0100
Subject: [PATCH] syntax-check: enforce the no-cvs-keywords prohibition

* Makefile.maint (sc_prohibit_cvs_keyword): New rule.
Suggested by Daniel Veillard.
The new test exposed two uses of $Date$.
* docs/Goals: Don't use $Date$.
* python/TODO: Likewise.
---
 Makefile.maint |    8 ++++++++
 docs/Goals     |    1 -
 python/TODO    |    2 --
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Makefile.maint b/Makefile.maint
index fda15db..5758215 100644
--- a/Makefile.maint
+++ b/Makefile.maint
@@ -81,6 +81,14 @@ sc_space_tab:
 	  { echo '$(ME): found SPACE-TAB sequence; remove the SPACE'	\
 		1>&2; exit 1; } || :

+cvs_keywords = \
+  Author|Date|Header|Id|Name|Locker|Log|RCSfile|Revision|Source|State
+
+sc_prohibit_cvs_keyword:
+	@grep -nE '\$$($(cvs_keywords))\$$' $$($(VC_LIST_EXCEPT)) &&	\
+	  { echo '$(ME): do not use CVS keyword expansion '		\
+		1>&2; exit 1; } || :
+
 # Don't use *scanf or the old ato* functions in `real' code.
 # They provide no error checking mechanism.
 # Instead, use strto* functions.
diff --git a/docs/Goals b/docs/Goals
index fbe2a5e..70c1d25 100644
--- a/docs/Goals
+++ b/docs/Goals
@@ -26,4 +26,3 @@ the underlying acual implementation of the hypervisor calls.
    releases of the library.

 Daniel Veillard <veillard at redhat.com>
-$Date$
diff --git a/python/TODO b/python/TODO
index f78c07b..4627482 100644
--- a/python/TODO
+++ b/python/TODO
@@ -4,5 +4,3 @@
 - add examples, web page and python based test suite

 Daniel Veillard
-
-$Date$
--
1.6.0.4.1044.g77718




More information about the libvir-list mailing list