Skip to content

Commit

Permalink
Only add the child config_dir option if it is set in the parent.
Browse files Browse the repository at this point in the history
  • Loading branch information
FredLoney committed Jun 21, 2017
1 parent bf8fb72 commit 95b5610
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions qipipe/pipeline/workflow_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,7 @@ def depict_workflow(self, workflow):
def _child_options(self):
"""
Collects the following options for creating a child workflow:
* project
* config_dir
* base_dir
Expand All @@ -189,13 +190,16 @@ def _child_options(self):
:return: the options sufficient to create a child workflow
"""
return dict(
opts = dict(
project=self.project,
base_dir=self.base_dir,
config_dir=self.config_dir,
dry_run=self.dry_run,
distributable=self.is_distributable
)
if self.config_dir:
opts['config_dir'] = self.config_dir

return opts

def _load_configuration(self, name):
"""
Expand Down

0 comments on commit 95b5610

Please sign in to comment.