Skip to content

Commit

Permalink
Use config 'outputDirectory' in FileMode
Browse files Browse the repository at this point in the history
If file.dir is not set or is relative, the global 'outputDirectory'
setting will be used.
  • Loading branch information
remram44 committed Jul 8, 2015
1 parent 0cc58e0 commit 4274cda
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions vistrails/core/modules/output_modules.py
Original file line number Diff line number Diff line change
Expand Up @@ -486,10 +486,13 @@ def get_filename(self, configuration, full_path=None, filename=None,
if suffix is None:
suffix = ''
if dirname is None:
# FIXME should unify with VisTrails output
# directory global! should check for abspath (if
# not, use relative to global output directory)
dirname = ''
if not os.path.isabs(dirname):
vt_output_dir = getattr(get_vistrails_temp_configuration(),
'outputDirectory',
None)
if vt_output_dir:
dirname = os.path.join(vt_output_dir, dirname)

# seriesPadding and series have defaults so no
# need to default them
Expand Down

0 comments on commit 4274cda

Please sign in to comment.