scripts: rearrange Options, make --version behave the same for all commands

This commit is contained in:
Brian Warner
2007-08-16 12:50:19 -07:00
parent 4ed7f0ac2a
commit ceef80bee6
3 changed files with 23 additions and 18 deletions

View File

@ -3,9 +3,10 @@ import sys
from cStringIO import StringIO
from twisted.python import usage
from allmydata.scripts.common import BaseOptions
import debug, create_node, startstop_node, cli
class Options(cli.OptionsMixin):
class Options(BaseOptions, usage.Options):
synopsis = "Usage: allmydata <command> [command options]"
subCommands = []
@ -14,15 +15,6 @@ class Options(cli.OptionsMixin):
subCommands += debug.subCommands
subCommands += cli.subCommands
def opt_version(self):
from twisted import copyright
import allmydata, zfec, foolscap
print "Twisted version:", copyright.version
print "Foolscap version:", foolscap.__version__
print "zfec version:", zfec.__version__
print "allmydata version:", allmydata.__version__
sys.exit(0)
def postOptions(self):
if not hasattr(self, 'subOptions'):
raise usage.UsageError("must specify a command")