diff options
| author | Robin Houston <robin.houston@gmail.com> | 2012-09-06 15:00:05 +0100 |
|---|---|---|
| committer | Robin Houston <robin.houston@gmail.com> | 2012-09-06 15:00:05 +0100 |
| commit | 006717f1ac39557e50052bb5755d430a1fa100ee (patch) | |
| tree | d07209a4ad2003111c03948d537127d40dda9799 /lib/alaveteli_external_command.rb | |
| parent | 537b97ff069cac999da3ca80ede77fedc79e39ff (diff) | |
| parent | 74531a783a8ea62a80596b435bd151cec2bf82c8 (diff) | |
Merge branch 'master' of git.mysociety.org:/data/git/public/alaveteli
Conflicts:
spec/controllers/api_controller_spec.rb
Diffstat (limited to 'lib/alaveteli_external_command.rb')
| -rw-r--r-- | lib/alaveteli_external_command.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/alaveteli_external_command.rb b/lib/alaveteli_external_command.rb index b1d4f17d1..7d32be904 100644 --- a/lib/alaveteli_external_command.rb +++ b/lib/alaveteli_external_command.rb @@ -30,7 +30,7 @@ module AlaveteliExternalCommand if opts.has_key? :append_to xc.out = opts[:append_to] end - xc.run(opts[:stdin_string], opts[:env] || {}) + xc.run(opts[:stdin_string] || "", opts[:env] || {}) if xc.status != 0 # Error $stderr.puts("Error from #{program_name} #{args.join(' ')}:") |