Commit abdd0199 authored by Mihai Patrascoiu's avatar Mihai Patrascoiu
Browse files

Apply validation only after taking into account parameters from both the bulk file and the CLI

parent 0c75495b
......@@ -184,12 +184,10 @@ class JobSubmitter(Base):
self.logger.critical("Too many parameters")
sys.exit(1)
if self.options.ipv4 and self.options.ipv6:
self._prepare_options()
if self.params['ipv4'] and self.params['ipv6']:
self.opt_parser.error('ipv4 and ipv6 can not be used at the same time')
if self.options.verbose:
self.logger.setLevel(logging.DEBUG)
def _build_transfers(self):
if self.options.bulk_file:
with open(self.options.bulk_file, 'r') as file:
......@@ -306,7 +304,6 @@ class JobSubmitter(Base):
def run(self):
context = self._create_context()
self._prepare_options()
if not self.options.dry_run:
return self._do_submit(context)
else:
......
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