Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

qvm-pool actions remove access to app

Browse Source
This commit is contained in:
Bahtiar `kalkin-` Gadimov 2016-05-25 16:51:10 +02:00
parent ed1a6977c0
commit 27305dd85d
No known key found for this signature in database
GPG Key ID: 96ED3C3BA19C3DEE
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
qubes/tools/qvm_pool.py
View File

@ -99,12 +99,8 @@ class _Remove(argparse.Action):
help='remove pool') help='remove pool')
def __call__(self, parser, namespace, name, option_string=None): def __call__(self, parser, namespace, name, option_string=None):
app = qubes.Qubes(namespace.app) setattr(namespace, 'command', 'remove')
if name in app.pools.keys(): setattr(namespace, 'name', name)
setattr(namespace, 'command', 'remove')
setattr(namespace, 'name', name)
else:
parser.error('no such pool %s\n' % name)
class _Add(argparse.Action): class _Add(argparse.Action):
@ -119,12 +115,8 @@ class _Add(argparse.Action):
help='add pool') help='add pool')
def __call__(self, parser, namespace, values, option_string=None): def __call__(self, parser, namespace, values, option_string=None):
app = qubes.Qubes(namespace.app)
name, driver = values name, driver = values
if driver not in drivers:
if name in app.pools.keys():
parser.error('pool named %s already exists \n' % name)
elif driver not in drivers:
parser.error('driver %s is unknown \n' % driver) parser.error('driver %s is unknown \n' % driver)
else: else:
setattr(namespace, 'command', 'add') setattr(namespace, 'command', 'add')
@ -195,15 +187,21 @@ def main(args=None):
:param list args: Optional arguments to override those delivered from \ :param list args: Optional arguments to override those delivered from \
command line. command line.
''' '''
args = get_parser().parse_args(args) parser = get_parser()
args = parser.parse_args(args)
if args.command is None or args.command == 'list': if args.command is None or args.command == 'list':
list_pools(args.app) list_pools(args.app)
elif args.command == 'add': elif args.command == 'add':
if args.name in args.app.pools.keys():
parser.error('pool named %s already exists \n' % args.name)
args.app.add_pool(name=args.name, driver=args.driver, **args.options) args.app.add_pool(name=args.name, driver=args.driver, **args.options)
args.app.save() args.app.save()
elif args.command == 'remove': elif args.command == 'remove':
args.app.remove_pool(args.name) if args.name in args.app.pools.keys():
args.app.save() args.app.remove_pool(args.name)
args.app.save()
else:
parser.print_error('no such pool %s\n' % args.name)
elif args.command == 'info': elif args.command == 'info':
pool_info(args.pools) pool_info(args.pools)
return 0 return 0