[libvirt] [PATCH] remove cvs $Id$ strings
Here's the change to remove the few remaining CVS $Id$ strings:
From f2a2d1403656cdfe6e927c476da66ad0c49487ae Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering@redhat.com> Date: Fri, 12 Dec 2008 13:36:08 +0100 Subject: [PATCH] remove cvs $Id$ strings
* po/id.po: Likewise. * qemud/remote_generate_stubs.pl: Likewise. * src/virsh.c: Likewise. * tests/testutils.c: Likewise. * tests/testutils.h: Likewise. * RENAMES: Likewise. --- RENAMES | 2 -- po/id.po | 1 - qemud/remote_generate_stubs.pl | 2 -- src/virsh.c | 3 --- tests/testutils.c | 4 +--- tests/testutils.h | 4 +--- 6 files changed, 2 insertions(+), 14 deletions(-) diff --git a/RENAMES b/RENAMES index 27f85a4..143aebd 100644 --- a/RENAMES +++ b/RENAMES @@ -2,8 +2,6 @@ # # File renames don't normally go into patches because they make # the patches much harder to read, so list them here instead. -# -# $Id$ # Clearer naming scheme after Xen-unified patch went in. src/xen_internal.c src/xen_internal_hv.c diff --git a/po/id.po b/po/id.po index 5590e65..458b033 100644 --- a/po/id.po +++ b/po/id.po @@ -1,7 +1,6 @@ # translation of libvirt to Bahasa Indonesia (id). # This file is distributed under the same license as the libvirt package. # Teguh DC <dheche@songolimo.net>, 2007. -# $Id$ msgid "" msgstr "" "Project-Id-Version: libvirt\n" diff --git a/qemud/remote_generate_stubs.pl b/qemud/remote_generate_stubs.pl index 2dff468..44e1552 100755 --- a/qemud/remote_generate_stubs.pl +++ b/qemud/remote_generate_stubs.pl @@ -4,8 +4,6 @@ # code for both ends of the remote connection. # # By Richard Jones <rjones@redhat.com> -# -# $Id$ use strict; diff --git a/src/virsh.c b/src/virsh.c index 1a5b42f..f4a57f4 100644 --- a/src/virsh.c +++ b/src/virsh.c @@ -8,9 +8,6 @@ * Daniel Veillard <veillard@redhat.com> * Karel Zak <kzak@redhat.com> * Daniel P. Berrange <berrange@redhat.com> - * - * - * $Id$ */ #include <config.h> diff --git a/tests/testutils.c b/tests/testutils.c index 0255bdf..187123c 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -1,13 +1,11 @@ /* * testutils.c: basic test utils * - * Copyright (C) 2005-2007 Red Hat, Inc. + * Copyright (C) 2005-2008 Red Hat, Inc. * * See COPYING.LIB for the License of this software * * Karel Zak <kzak@redhat.com> - * - * $Id$ */ #include <config.h> diff --git a/tests/testutils.h b/tests/testutils.h index 7afd579..fd326ae 100644 --- a/tests/testutils.h +++ b/tests/testutils.h @@ -1,13 +1,11 @@ /* * utils.c: test utils * - * Copyright (C) 2005 Red Hat, Inc. + * Copyright (C) 2005, 2008 Red Hat, Inc. * * See COPYING.LIB for the License of this software * * Karel Zak <kzak@redhat.com> - * - * $Id$ */ #ifndef __VIT_TEST_UTILS_H__ -- 1.6.0.4.1044.g77718
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 ? Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel@veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/
Daniel Veillard <veillard@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@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@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
On Fri, Dec 12, 2008 at 06:51:52PM +0100, Jim Meyering wrote:
Daniel Veillard <veillard@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:
Urgh $Date$ in text files is an old bad habit of mine :-) because it's someohow useful to know how outdated the information is, but CVS ids are not a good idea in retrospect even for this +1 Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel@veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/
participants (2)
-
Daniel Veillard -
Jim Meyering