Skip to content

FIX: Interfaces redirecting X crashed if $DISPLAY not defined #1027

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jan 22, 2015
Merged

FIX: Interfaces redirecting X crashed if $DISPLAY not defined #1027

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
94a3bea
fix KeyError when using redirect_x in CommandLineInterface
oesteban Jan 21, 2015
78fb543
make specs
oesteban Jan 21, 2015
5145082
Merge branch 'master' into fix/RedirectX
oesteban Jan 21, 2015
c6386ea
update CHANGES
oesteban Jan 21, 2015
cf7c611
delete line instead comment out
oesteban Jan 21, 2015
f189901
Merge branch 'master' into fix/RedirectX
oesteban Jan 21, 2015
3aa44c0
Fix conflicts
oesteban Jan 21, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGES
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
Next release
============

* FIX: Interfaces redirecting X crashed if $DISPLAY not defined (https://github.com/nipy/nipype/pull/1027)
* FIX: Bug crashed 'make api' (https://github.com/nipy/nipype/pull/1026)
* ENH: Updated antsIntroduction to handle RA and RI registrations (https://github.com/nipy/nipype/pull/1009)
* ENH: Updated N4BiasCorrection input spec to include weight image and spline order. Made
Expand Down
6 changes: 3 additions & 3 deletions nipype/interfaces/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -758,12 +758,12 @@ def _get_trait_desc(self, inputs, name, spec):
manhelpstr = ['\t%s' % name]

type_info = spec.full_info(inputs, name, None)
default = ''

default = ''
if spec.usedefault:
default = ', nipype default value: %s' % str(spec.default_value()[1])

line = "(%s%s)" % (type_info, default)

manhelpstr = wrap(line, 70,
initial_indent=manhelpstr[0]+': ',
subsequent_indent='\t\t ')
Expand Down Expand Up @@ -991,7 +991,7 @@ def run(self, **inputs):
time.sleep(0.2) # give Xvfb time to start
if xvfb_proc.poll() is not None:
raise Exception('Error: Xvfb did not start')
old_displaynum = os.environ['DISPLAY']

runtime.environ['DISPLAY'] = ':%s' % vdisplay_num

runtime = self._run_interface(runtime)
Expand Down