Changeset 66bb590 for fedd/fedd_terminate.py

Timestamp:

Dec 10, 2010 9:03:35 AM (13 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master

Children:

52b6ebc

Parents:

913dc7a (diff), 8d5394e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of tardis.deterlab.net:/var/local/git/fedd

File:

• fedd/fedd_terminate.py (modified) (2 diffs)

fedd/fedd_terminate.py

@@ -12 +12 @@
         client_opts.__init__(self)
         self.add_option("--experiment_cert", dest="exp_certfile",
-                type="string", help="experiment certificate file")
+                action='callback', callback=self.expand_file, type='str',
+                help="experiment certificate file")
         self.add_option("--experiment_name", dest="exp_name",
                 type="string", help="human readable experiment name")
@@ -19 +20 @@
                 help="Force termination if experiment is in strange state")
         self.add_option("--logfile", dest="logfile", default=None,
+                action='callback', callback=self.expand_file, type='str',
                 help="File to write log to")
         self.add_option("--print_log", dest="print_log", default=False,