Changeset 0a49bd7 for fedd/fedd.py
- Timestamp:
- Jan 15, 2011 5:52:15 PM (13 years ago)
- Branches:
- axis_example, compt_changes, info-ops, master
- Children:
- aaf7f41
- Parents:
- ac15159 (diff), 944b746 (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. - git-author:
- Ted Faber <faber@…> (01/15/11 17:51:40)
- git-committer:
- Ted Faber <faber@…> (01/15/11 17:52:15)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
fedd/fedd.py
rac15159 r0a49bd7 7 7 from federation import config_parser 8 8 from federation.server import server, xmlrpc_handler, soap_handler 9 from federation.util import fedd_ssl_context 9 from federation.util import fedd_ssl_context, file_expanding_opts 10 10 from federation.deter_impl import new_feddservice 11 11 … … 18 18 import logging 19 19 import M2Crypto 20 21 class fedd_opts(OptionParser): 20 import os.path 21 22 class fedd_opts(file_expanding_opts): 22 23 """Encapsulate option processing in this class, rather than in main""" 24 23 25 def __init__(self): 24 OptionParser.__init__(self, usage="%prog [opts] (--help for details)", 26 file_expanding_opts.__init__(self, 27 usage="%prog [opts] (--help for details)", 25 28 version="0.1") 26 29 … … 29 32 self.add_option("-d", "--debug", action="count", dest="debug", 30 33 help="Set debug. Repeat for more information") 31 self.add_option("-f", "--configfile", action="store", 34 self.add_option("-f", "--configfile", action="callback", 35 callback=self.expand_file, type='str', 32 36 default="/usr/local/etc/fedd.conf", 33 dest="configfile", help="Configuration file (required)")37 dest="configfile", help="Configuration file") 34 38 self.add_option("-l", "--logfile", action="store", dest="logfile", 35 39 help="File to send log messages to")
Note: See TracChangeset
for help on using the changeset viewer.