Merge pull request #105 from yast/fix_unshift

Fix unshift
yast · Feb 27, 2014 · 0263c9e · 0263c9e
2 parents 1d1f801 + 02b79bc
commit 0263c9e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/package/yast2-ruby-bindings.changes b/package/yast2-ruby-bindings.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Feb 27 12:10:11 UTC 2014 - jreidinger@suse.com
+
+- fix precedence of loading files in lib
+- 3.1.13
+
 -------------------------------------------------------------------
 Wed Feb 26 12:22:48 UTC 2014 - lslezak@suse.cz
 

diff --git a/package/yast2-ruby-bindings.spec b/package/yast2-ruby-bindings.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-ruby-bindings
-Version:        3.1.12
+Version:        3.1.13
 Release:        0
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source0:        yast2-ruby-bindings-%{version}.tar.bz2

diff --git a/src/ruby/yast.rb b/src/ruby/yast.rb
@@ -44,8 +44,9 @@
 require "yast/ui_shortcuts"
 require "yast/wfm"
 
-#add yast specific path for ruby libraries, similar to lib directory in rails
-Yast.y2paths.each do |p|
+# add yast specific path for ruby libraries, similar to lib directory in rails
+# unshift it in reverse order to keep precedence
+Yast.y2paths.reverse.each do |p|
   dir_path = File.join(p, "lib")
   if File.exists? dir_path
     $LOAD_PATH.unshift dir_path