diff options
author | Narayan Desai <desai@mcs.anl.gov> | 2008-01-08 03:43:31 +0000 |
---|---|---|
committer | Narayan Desai <desai@mcs.anl.gov> | 2008-01-08 03:43:31 +0000 |
commit | d97a2114f6bf03fac3682076c8387a5ccb570946 (patch) | |
tree | 545883c3c36a120ef5552196b02f45d4e0705843 /src/sbin/bcfg2-admin | |
parent | e3bd8d2ecf13040bdb12484988db8614f6b397fc (diff) | |
download | bcfg2-d97a2114f6bf03fac3682076c8387a5ccb570946.tar.gz bcfg2-d97a2114f6bf03fac3682076c8387a5ccb570946.tar.bz2 bcfg2-d97a2114f6bf03fac3682076c8387a5ccb570946.zip |
fix imports and variable shadowing in bcfg2-admin
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@4202 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/sbin/bcfg2-admin')
-rwxr-xr-x | src/sbin/bcfg2-admin | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/sbin/bcfg2-admin b/src/sbin/bcfg2-admin index fb9a58c7d..5b5053135 100755 --- a/src/sbin/bcfg2-admin +++ b/src/sbin/bcfg2-admin @@ -1,7 +1,7 @@ #!/usr/bin/env python '''bcfg2-admin is a script that helps to administrate a bcfg2 deployment''' -import getopt, difflib, logging, lxml.etree, os, popen2, re, socket, sys, ConfigParser +import getopt, logging, sys import Bcfg2.Server.Core, Bcfg2.Logging log = logging.getLogger('bcfg-admin') @@ -28,18 +28,18 @@ if __name__ == '__main__': raise SystemExit(1) - help = False + do_help = False # First get the options... for opt, arg in opts: if opt in ("-h", "--help"): - help = True + do_help = True if opt in ("-C", "--configfile"): configfile = arg modes = [x.lower() for x in Bcfg2.Server.Admin.__all__] modes.remove('mode') - if help or len(args) < 1 or args[0] == 'help': + if do_help or len(args) < 1 or args[0] == 'help': if len(args) > 1: args = [args[1], args[0]] else: |