summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Vosmaer <contact@jacobvosmaer.nl>2014-04-11 10:17:07 +0200
committerJacob Vosmaer <contact@jacobvosmaer.nl>2014-04-11 10:17:07 +0200
commit35aef23fd4b08f9da0c54450ce587ec65d9d8272 (patch)
treee93c25edab216133a0b3b8ebd18e6562106c66c6
parentdd94f7933724f18e59c284f01cf84f6c2f12be97 (diff)
parentb136e22d7e4ea34b35d805c380ba1fae2cf3c595 (diff)
downloadgitlab-shell-35aef23fd4b08f9da0c54450ce587ec65d9d8272.tar.gz
Merge pull request #145 from lsjostro/fix_env
Preserve LD_LIBRARY_PATH for Kernel::exec
-rw-r--r--lib/gitlab_shell.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab_shell.rb b/lib/gitlab_shell.rb
index e2a015a..086e36b 100644
--- a/lib/gitlab_shell.rb
+++ b/lib/gitlab_shell.rb
@@ -61,7 +61,7 @@ class GitlabShell
# This method is not covered by Rspec because it ends the current Ruby process.
def exec_cmd(*args)
- Kernel::exec({'PATH' => ENV['PATH'], 'GL_ID' => ENV['GL_ID']}, *args, unsetenv_others: true)
+ Kernel::exec({'PATH' => ENV['PATH'], 'LD_LIBRARY_PATH' => ENV['LD_LIBRARY_PATH'], 'GL_ID' => ENV['GL_ID']}, *args, unsetenv_others: true)
end
def api