Merge pull request #239 from yast/backport_rbenv_fix

Backport rbenv fix
yast · May 2, 2014 · 1815be0 · 1815be0
2 parents 049fa61 + 70f26aa
commit 1815be0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-3.0.13
+3.0.14
diff --git a/package/yast2.changes b/package/yast2.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri May  2 08:50:16 UTC 2014 - jreidinger@suse.com
+
+- Make sure the system ruby is used (BNC#845897)
+  ( thanks to Marc Schuetz <schuetz@gmx.net> )
+- 3.0.14
+
 -------------------------------------------------------------------
 Tue Mar  4 13:12:37 UTC 2014 - vmoravec@suse.com
 

diff --git a/scripts/yast2 b/scripts/yast2
@@ -15,6 +15,9 @@
 
 export PATH=/sbin:/usr/sbin:$PATH
 
+# make sure the system ruby is used, bnc#845897
+unset GEM_HOME GEM_PATH RUBYLIB RUBYPATH RUBYOPT
+
 # we need input methods for many locales bnc#776567
 
 export QT_IM_MODULE=xim GTK_IM_MODULE=xim