diff --git a/tsshbatch.py b/tsshbatch.py index 950967f..bdecd6e 100755 --- a/tsshbatch.py +++ b/tsshbatch.py @@ -20,7 +20,7 @@ CMDINCL = PROGENV + "CMDS" HOSTINCL = PROGENV + "HOSTS" -CVSID = "$Id: tsshbatch.py,v 1.197 2014/12/04 01:01:26 tundra Exp $" +CVSID = "$Id: tsshbatch.py,v 1.198 2014/12/04 01:25:13 tundra Exp $" VERSION = CVSID.split()[2] CPRT = "(c)" PROGDATE = "2011-2014" @@ -899,8 +899,22 @@ for source in xfers: for dest in xfers[source]: + + # Dereference any variables in the file transfer specification + + source = VarSub(source) + dest = VarSub(dest) + unrolled.append(source + (PADWIDTH*3 - len(source)) * " "+ SEPARATOR + dest) + # Dereference any variables in the list of commands + + index = 0 + while (index < len(Commands)): + + Commands[index] = VarSub(Commands[index]) + index += 1 + for prompt, description, items in ((TESTRUN, " ".join(OPTIONS), ["\n"]), (SYMTABLE, "", symtbl + ["\n"]), (HOSTLIST, "", Hosts + ["\n"]),