Commit f97c7901 authored by Michael Hanselmann's avatar Michael Hanselmann
Browse files

Update copyright year, imports of cfgupgrade

Reviewed-by: iustinp
parent 283439c9
#!/usr/bin/python #!/usr/bin/python
# #
# Copyright (C) 2007 Google Inc. # Copyright (C) 2007, 2008 Google Inc.
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
...@@ -37,7 +37,7 @@ import tempfile ...@@ -37,7 +37,7 @@ import tempfile
import simplejson import simplejson
from ganeti import utils from ganeti import utils
from ganeti.cli import AskUser, FORCE_OPT from ganeti import cli
options = None options = None
...@@ -175,7 +175,7 @@ if __name__ == "__main__": ...@@ -175,7 +175,7 @@ if __name__ == "__main__":
action="store_true", action="store_true",
help="Try to do the conversion, but don't write" help="Try to do the conversion, but don't write"
" output file") " output file")
parser.add_option(FORCE_OPT) parser.add_option(cli.FORCE_OPT)
parser.add_option('--verbose', dest='verbose', parser.add_option('--verbose', dest='verbose',
action="store_true", action="store_true",
help="Verbose output") help="Verbose output")
...@@ -190,7 +190,7 @@ if __name__ == "__main__": ...@@ -190,7 +190,7 @@ if __name__ == "__main__":
if not options.force: if not options.force:
usertext = ("%s MUST run on the master node. Is this the master" usertext = ("%s MUST run on the master node. Is this the master"
" node?" % program) " node?" % program)
if not AskUser(usertext): if not cli.AskUser(usertext):
sys.exit(1) sys.exit(1)
config = ReadConfig(cfg_file) config = ReadConfig(cfg_file)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment