diff --git a/tsshbatch.py b/tsshbatch.py index 031bd9e..22b782e 100755 --- a/tsshbatch.py +++ b/tsshbatch.py @@ -20,13 +20,13 @@ CMDINCL = PROGENV + "CMDS" HOSTINCL = PROGENV + "HOSTS" -CVSID = "$Id: tsshbatch.py,v 1.195 2014/12/03 19:37:40 tundra Exp $" +CVSID = "$Id: tsshbatch.py,v 1.196 2014/12/03 19:54:51 tundra Exp $" VERSION = CVSID.split()[2] CPRT = "(c)" -DATE = "2011-2014" +PROGDATE = "2011-2014" OWNER = "TundraWare Inc." RIGHTS = "All Rights Reserved." -COPYRIGHT = "Copyright %s %s, %s %s" % (CPRT, DATE, OWNER, RIGHTS) +COPYRIGHT = "Copyright %s %s, %s %s" % (CPRT, PROGDATE, OWNER, RIGHTS) PROGVER = PROGNAME + " " + VERSION + (" - %s" % COPYRIGHT) HOMEPAGE = "http://www.tundraware.com/Software/%s\n" % BASENAME @@ -128,12 +128,17 @@ ##### DATE = '__DATE__' +DATETIME = '__DATETIME__' HOSTNAME = '__HOSTNAME__' HOSTNUM = '__HOSTNUM__' HOSTSHORT = '__HOSTSHORT__' TIME = '__TIME__' -BuiltIns = (DATE, HOSTNAME, HOSTNUM, HOSTSHORT, TIME) +# This is needed to differentiate between user-defined and builtin +# variables later in order to support the user being able to redefine +# them. + +BuiltIns = (DATE, DATETIME, HOSTNAME, HOSTNUM, HOSTSHORT, TIME) ##### # Global Symbol Table @@ -910,6 +915,7 @@ internals = [ (DATE, time.strftime("%Y%m%d")), + (DATETIME, time.strftime("%Y%m%d%H%M%S")), (HOSTNAME, host), (HOSTNUM, str(hostnum)), (HOSTSHORT, host.split('.')[0]),