stackforge/swiftsync
Code Issues Proposed changes

Merge pull request #28 from morucci/issue-12

Browse Source 
Fix issue #12
This commit is contained in:
Chmouel Boudjnah 2013-04-08 04:57:31 -07:00
commit 466a7a1485
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
bin/swfiller
View File

@ -16,7 +16,8 @@ from swsync import utils
def main(): def main():
parser = argparse.ArgumentParser(prog='swift-filler', add_help=True) parser = argparse.ArgumentParser(prog='swift-filler',
add_help=True)
parser.add_argument('--delete', parser.add_argument('--delete',
action='store_true', action='store_true',
help='Suppress created accounts/users') help='Suppress created accounts/users')
@ -42,10 +43,28 @@ def main():
dest='log_level', dest='log_level',
default='info', default='info',
help='Specify the log level') help='Specify the log level')
parser.add_argument('--config',
dest='config',
help='Optional configuration file path')
args = parser.parse_args() args = parser.parse_args()
utils.set_logging(args.log_level) utils.set_logging(args.log_level)
if args.config and os.path.isfile(args.config):
try:
conf = utils.parse_ini(args.config)
logging.info('Unable to parse provided conf file')
except Exception:
pass
else:
try:
conf = utils.parse_ini()
except(utils.ConfigurationError):
parser.print_help()
sys.exit(1)
utils.CONFIG = conf
if not args.create and not args.delete: if not args.create and not args.delete:
parser.print_help() parser.print_help()
sys.exit(1) sys.exit(1)