Changeset 66bb590 for fedd/confirm_sshkey.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/confirm_sshkey.py (modified) (2 diffs)

fedd/confirm_sshkey.py

@@ -3 +3 @@
 import os, sys
 import MySQLdb
-from optparse import OptionParser
+from federation.util import file_expanding_opts
 
 
-class opt_parser(OptionParser):
+class opt_parser(file_expanding_opts):
     def __init__(self):
         OptionParser.__init__(self, usage="%prog [opts] (--help for details)",
@@ -12 +12 @@
         self.add_option('-u', '--user', dest='user', action='store',
                 default=None, help="User to confirm key of")
-        self.add_option('-f', '--keyfile', dest='keyfile', action='store',
+        self.add_option('-f', '--keyfile', dest='keyfile',
+                action='callback', callback=self.expand_file, type='str',
                 default=None, help="file containing pubkey to confirm")
-        self.add_option('-k', '--key', dest='key',
-                default=None, action='store',
+        self.add_option('-k', '--key', dest='key', default=None, 
+                action='callback', callback=self.expand_file, type='str',
                 help='Key on the command line')
         self.add_option('-q', '--quiet', dest='verbose', action='store_false',