Revision 2f79bd34

b/scripts/gnt-backup
19 19
# 02110-1301, USA.
20 20

  
21 21

  
22
# pylint: disable-msg=W0401,W0614
23
# W0401: Wildcard import ganeti.cli
24
# W0614: Unused import %s from wildcard import (since we need cli)
25

  
22 26
import sys
23 27
from optparse import make_option
24 28

  
25 29
from ganeti.cli import *
26
from ganeti import cmdlib
27 30
from ganeti import opcodes
28 31
from ganeti import constants
29 32

  
b/scripts/gnt-cluster
19 19
# 02110-1301, USA.
20 20

  
21 21

  
22
# pylint: disable-msg=W0401,W0614
23
# W0401: Wildcard import ganeti.cli
24
# W0614: Unused import %s from wildcard import (since we need cli)
25

  
22 26
import sys
23 27
from optparse import make_option
24 28
import os.path
......
30 34
from ganeti import utils
31 35
from ganeti import bootstrap
32 36
from ganeti import ssh
33
from ganeti import ssconf
34 37

  
35 38

  
36 39
def InitCluster(opts, args):
b/scripts/gnt-debug
19 19
# 02110-1301, USA.
20 20

  
21 21

  
22
# pylint: disable-msg=W0401,W0614
23
# W0401: Wildcard import ganeti.cli
24
# W0614: Unused import %s from wildcard import (since we need cli)
25

  
22 26
import sys
23
import os
24
import itertools
25 27
import simplejson
26 28
import time
27 29

  
28 30
from optparse import make_option
29
from cStringIO import StringIO
30 31

  
31 32
from ganeti.cli import *
32 33
from ganeti import opcodes
b/scripts/gnt-instance
19 19
# 02110-1301, USA.
20 20

  
21 21

  
22
# pylint: disable-msg=W0401,W0614
23
# W0401: Wildcard import ganeti.cli
24
# W0614: Unused import %s from wildcard import (since we need cli)
25

  
22 26
import sys
23 27
import os
24 28
import itertools
......
353 357

  
354 358
  def _PopulateWithDefaults(spec):
355 359
    """Returns a new hash combined with default values."""
356
    dict = _DEFAULT_SPECS.copy()
357
    dict.update(spec)
358
    return dict
360
    mydict = _DEFAULT_SPECS.copy()
361
    mydict.update(spec)
362
    return mydict
359 363

  
360 364
  def _Validate(spec):
361 365
    """Validate the instance specs."""
......
456 460
      ToStdout("User aborted reinstall, exiting")
457 461
      return 1
458 462

  
459
    os = selected
463
    os_name = selected
460 464
  else:
461
    os = opts.os
465
    os_name = opts.os
462 466

  
463 467
  if not opts.force:
464 468
    usertext = ("This will reinstall the instance %s and remove"
......
467 471
      return 1
468 472

  
469 473
  op = opcodes.OpReinstallInstance(instance_name=instance_name,
470
                                   os_type=os)
474
                                   os_type=os_name)
471 475
  SubmitOrSend(op, opts)
472 476

  
473 477
  return 0
......
726 730
      os.execvp(cmd[0], cmd)
727 731
    finally:
728 732
      ToStderr("Can't run console command %s with arguments:\n'%s'",
729
               cmd, " ".join(argv))
733
               cmd[0], " ".join(cmd))
730 734
      os._exit(1)
731 735

  
732 736

  
b/scripts/gnt-job
19 19
# 02110-1301, USA.
20 20

  
21 21

  
22
# pylint: disable-msg=W0401,W0614
23
# W0401: Wildcard import ganeti.cli
24
# W0614: Unused import %s from wildcard import (since we need cli)
25

  
22 26
import sys
23
import os
24
import itertools
25
import time
26
from optparse import make_option
27
from cStringIO import StringIO
28 27

  
29 28
from ganeti.cli import *
30
from ganeti import opcodes
31 29
from ganeti import constants
32
from ganeti import utils
33 30
from ganeti import errors
34 31

  
35 32

  
......
184 181
    if status in _USER_JOB_STATUS:
185 182
      status = _USER_JOB_STATUS[status]
186 183
    else:
187
      raise errors.ProgrammerError("Unknown job status code '%s'" % val)
184
      raise errors.ProgrammerError("Unknown job status code '%s'" % status)
188 185

  
189 186
    format(1, "Status: %s" % status)
190 187

  
b/scripts/gnt-node
19 19
# 02110-1301, USA.
20 20

  
21 21

  
22
# pylint: disable-msg=W0401,W0614
23
# W0401: Wildcard import ganeti.cli
24
# W0614: Unused import %s from wildcard import (since we need cli)
25

  
22 26
import sys
23 27
from optparse import make_option
24 28

  
b/scripts/gnt-os
19 19
# 02110-1301, USA.
20 20

  
21 21

  
22
# pylint: disable-msg=W0401,W0614
23
# W0401: Wildcard import ganeti.cli
24
# W0614: Unused import %s from wildcard import (since we need cli)
25

  
22 26
import sys
23 27
from optparse import make_option
24 28

  
25 29
from ganeti.cli import *
26 30
from ganeti import opcodes
27
from ganeti import objects
28 31
from ganeti import utils
29
from ganeti import errors
30 32
from ganeti import constants
31 33

  
32 34

  

Also available in: Unified diff