From 27ae61d51ba27a22a2e9048b90fe158dd3fac592 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Tue, 27 Mar 2012 14:36:51 +0200 Subject: [PATCH] get rid of svn keywords once and for good --- bashrc | 2 -- bin/clean-empty-dirs.py | 2 -- bin/dns-config | 2 -- bin/mtail.py | 5 +---- bin/plc-config | 2 -- bin/plc-kml.py | 2 -- bin/plc-orphan-accounts.py | 2 -- bin/refresh-peer.py | 1 - default_config.xml | 2 -- plc.d/dns | 2 -- plc.d/functions | 3 --- plc.d/gpg | 2 -- plc.d/httpd | 2 -- plc.d/mail | 2 -- plc.d/network | 2 -- plc.d/ssh | 2 -- plc_config.dtd | 1 - plc_config.py | 6 +----- support-scripts/gen-sites-xml.py | 2 -- support-scripts/gen-static-content.py | 2 -- support-scripts/gen_aliases.py | 2 -- support-scripts/renew_reminder.py | 2 -- 22 files changed, 2 insertions(+), 48 deletions(-) diff --git a/bashrc b/bashrc index 0e92877..3683fe4 100644 --- a/bashrc +++ b/bashrc @@ -1,6 +1,4 @@ # -*-sh-*- -# $Id$ -# $URL$ # this file defines a few convenience bash shorthands for managing myplc nodes # it is installed in /usr/share/myplc/aliases # you might wish to use it in your own bash startup files (.profile/.bashrc) diff --git a/bin/clean-empty-dirs.py b/bin/clean-empty-dirs.py index 244dfac..93d6415 100755 --- a/bin/clean-empty-dirs.py +++ b/bin/clean-empty-dirs.py @@ -1,7 +1,5 @@ #!/usr/bin/python ### -### $Id$ -### ### utility script for cleaning empty directories ### useful to clean up /var/tmp/bootmedium ### diff --git a/bin/dns-config b/bin/dns-config index 401a3a7..fbf294b 100755 --- a/bin/dns-config +++ b/bin/dns-config @@ -7,8 +7,6 @@ # Mark Huang # Copyright (C) 2006 The Trustees of Princeton University # -# $Id$ -# from plc_config import PLCConfiguration import os, sys diff --git a/bin/mtail.py b/bin/mtail.py index 706ccf5..f5d287c 100755 --- a/bin/mtail.py +++ b/bin/mtail.py @@ -15,8 +15,6 @@ from optparse import OptionParser class mtail: - subversion_id = "$Id$" - default_time_format = "%H:%M:%S" def __init__ (self, args ): @@ -32,7 +30,7 @@ class mtail: usage = """usage: %prog [options] file-or-dir ... example: # %prog -e '*access*' /var/log""" - parser=OptionParser(usage=usage,version=self.subversion_id) + parser=OptionParser(usage=usage) # tail_period parser.add_option("-p","--period", type="int", dest="tail_period", default=1, help="Files check period in seconds") @@ -78,7 +76,6 @@ example: self.args.append("/var/log/httpd/sfa_access_log") if self.options.verbose: - print 'Version:',self.subversion_id print 'Options:',self.options print 'Arguments:',self.args diff --git a/bin/plc-config b/bin/plc-config index 78fc6db..ca6dc00 100755 --- a/bin/plc-config +++ b/bin/plc-config @@ -6,8 +6,6 @@ # Mark Huang # Copyright (C) 2006 The Trustees of Princeton University # -# $Id$ -# import sys import os diff --git a/bin/plc-kml.py b/bin/plc-kml.py index 2a1ecf9..c8b7de9 100755 --- a/bin/plc-kml.py +++ b/bin/plc-kml.py @@ -1,7 +1,5 @@ #!/usr/bin/env plcsh # -# $Id$ - # this script generates a kml file, located under the default location below # you should crontab this job from your myplc image # you can then use the googlemap.js javascript for creating your applet diff --git a/bin/plc-orphan-accounts.py b/bin/plc-orphan-accounts.py index b8ce321..2edc2e8 100755 --- a/bin/plc-orphan-accounts.py +++ b/bin/plc-orphan-accounts.py @@ -1,7 +1,5 @@ #!/usr/bin/env plcsh # -# $Id$ -# # searches and displays any local orphan account (not attached to a site) # remote accounts with identical emails are displayed as well diff --git a/bin/refresh-peer.py b/bin/refresh-peer.py index 54c8844..c5fa748 100644 --- a/bin/refresh-peer.py +++ b/bin/refresh-peer.py @@ -1,5 +1,4 @@ #!/usr/bin/env plcsh -# $Id$ import sys,time,os,os.path diff --git a/default_config.xml b/default_config.xml index 94d4ab5..c9f3bab 100644 --- a/default_config.xml +++ b/default_config.xml @@ -6,8 +6,6 @@ Default PLC configuration file Mark Huang Copyright (C) 2006 The Trustees of Princeton University -$Id$ -$URL$ --> diff --git a/plc.d/dns b/plc.d/dns index 377a269..afdf55f 100755 --- a/plc.d/dns +++ b/plc.d/dns @@ -1,6 +1,4 @@ #!/bin/bash -# $Id$ -# $URL$ # # priority: 950 # diff --git a/plc.d/functions b/plc.d/functions index 5f52e10..ec6c6ef 100644 --- a/plc.d/functions +++ b/plc.d/functions @@ -1,7 +1,4 @@ # -*-Shell-script-*- -# $Id$ -# $URL$ -# # Common functions for PLC startup/shutdown scripts # # Mark Huang diff --git a/plc.d/gpg b/plc.d/gpg index 2342885..39f6add 100755 --- a/plc.d/gpg +++ b/plc.d/gpg @@ -1,6 +1,4 @@ #!/bin/bash -# $Id$ -# $URL$ # # priority: 400 # diff --git a/plc.d/httpd b/plc.d/httpd index 101179d..94b4e18 100755 --- a/plc.d/httpd +++ b/plc.d/httpd @@ -1,6 +1,4 @@ #!/bin/bash -# $Id$ -# $URL$ # # priority: 600 # diff --git a/plc.d/mail b/plc.d/mail index 2adfc97..1585622 100755 --- a/plc.d/mail +++ b/plc.d/mail @@ -1,6 +1,4 @@ #!/bin/bash -# $Id$ -# $URL$ # # priority: 200 # diff --git a/plc.d/network b/plc.d/network index 782f3d7..363a0f6 100755 --- a/plc.d/network +++ b/plc.d/network @@ -1,6 +1,4 @@ #!/bin/bash -# $Id$ -# $URL$ # # priority: 100 # diff --git a/plc.d/ssh b/plc.d/ssh index 907c851..21d4fea 100755 --- a/plc.d/ssh +++ b/plc.d/ssh @@ -1,6 +1,4 @@ #!/bin/bash -# $Id$ -# $URL$ # # priority: 500 # diff --git a/plc_config.dtd b/plc_config.dtd index 9eea2fa..d5d57b4 100644 --- a/plc_config.dtd +++ b/plc_config.dtd @@ -4,7 +4,6 @@ Specification for PLC configuration files Mark Huang Copyright (C) 2006 The Trustees of Princeton University -$Id$ --> diff --git a/plc_config.py b/plc_config.py index ced7e37..4203862 100644 --- a/plc_config.py +++ b/plc_config.py @@ -873,10 +873,6 @@ class TrimTextElement(xml.dom.minidom.Element): #################### # GLOBAL VARIABLES # -release_id = "$Id$" -release_rev = "$Revision$" -release_url = "$URL$" - g_configuration=None usual_variables=None config_dir=None @@ -1295,7 +1291,7 @@ def check_dir (config_file): #################### def optParserSetup(configuration): - parser = OptionParser(usage=usage(), version="%prog " + release_rev + release_url ) + parser = OptionParser(usage=usage()) parser.set_defaults(config_dir=configuration['config_dir'], service=configuration['service'], usual_variables=configuration['usual_variables']) diff --git a/support-scripts/gen-sites-xml.py b/support-scripts/gen-sites-xml.py index 5da0f72..13db800 100755 --- a/support-scripts/gen-sites-xml.py +++ b/support-scripts/gen-sites-xml.py @@ -5,8 +5,6 @@ # Mark Huang # Copyright (C) 2006 The Trustees of Princeton University # -# $Id: gen-sites-xml.py,v 1.8 2007/09/14 20:08:28 tmack Exp $ -# import os, sys import getopt diff --git a/support-scripts/gen-static-content.py b/support-scripts/gen-static-content.py index 3539cab..22c9640 100755 --- a/support-scripts/gen-static-content.py +++ b/support-scripts/gen-static-content.py @@ -5,8 +5,6 @@ # Mark Huang # Copyright (C) 2005 The Trustees of Princeton University # -# $Id: gen-static-content.py,v 1.35.2.1 2007/02/07 03:27:50 mlhuang Exp $ -# import os, sys, shutil import time diff --git a/support-scripts/gen_aliases.py b/support-scripts/gen_aliases.py index 48a70fe..38b3ff5 100755 --- a/support-scripts/gen_aliases.py +++ b/support-scripts/gen_aliases.py @@ -25,8 +25,6 @@ # Mark Huang # Copyright (C) 2005 The Trustees of Princeton University # -# $Id$ -# import os, sys import plcapilib diff --git a/support-scripts/renew_reminder.py b/support-scripts/renew_reminder.py index 220fd14..be377bc 100755 --- a/support-scripts/renew_reminder.py +++ b/support-scripts/renew_reminder.py @@ -5,8 +5,6 @@ # Mark Huang # Copyright (C) 2005 The Trustees of Princeton University # -# $Id$ -# import os import sys -- 2.43.0