diff options
| author | cslocum <cslocum@d34015c8-bcbb-4646-8ac8-8ba5febf221d> | 2014-06-12 11:30:09 -0400 |
|---|---|---|
| committer | cslocum <cslocum@d34015c8-bcbb-4646-8ac8-8ba5febf221d> | 2014-06-12 11:30:09 -0400 |
| commit | 256c841c42500b15fa8494754ec2a3eb4b9e6bf7 (patch) | |
| tree | 98367c2bcdfad963d6f53176e0862a856982a5bf | |
| parent | e4ac3250aa924594ef4bd41b7c3664921d18ab95 (diff) | |
| download | steuermann-256c841c42500b15fa8494754ec2a3eb4b9e6bf7.tar.gz | |
more stuff
git-svn-id: https://svn.stsci.edu/svn/ssb/etal/steuermann/trunk@1278 d34015c8-bcbb-4646-8ac8-8ba5febf221d
| -rw-r--r-- | steuermann/nodes.py | 7 | ||||
| -rw-r--r-- | steuermann/run.py | 7 |
2 files changed, 6 insertions, 8 deletions
diff --git a/steuermann/nodes.py b/steuermann/nodes.py index 36c1f08..871b7c6 100644 --- a/steuermann/nodes.py +++ b/steuermann/nodes.py @@ -200,12 +200,7 @@ class node(object) : self.name = name # the command script that this node runs - print - print script - print saved_conditions - print - - self.script = script % saved_conditions + self.script = script self.script_type = script_type # what "resources" it requires diff --git a/steuermann/run.py b/steuermann/run.py index eb7efa5..d5535b3 100644 --- a/steuermann/run.py +++ b/steuermann/run.py @@ -31,6 +31,7 @@ import sys import errno import ConfigParser import re +import nodes def config_yes_no(d,which) : if not which in d : @@ -38,7 +39,7 @@ def config_yes_no(d,which) : s = d[which] return s.strip()[0].lower() in ( 'y', 't', '1' ) -debug=0 +debug=1 ##### @@ -152,7 +153,9 @@ class runner(object): ) print - print 'script = %s' %args['script'] + print 'script = %s' %args['script'] + print + print 'script = %s' %(args['script'] % nodes.saved_conditions) print |