Hello community,
here is the log from the commit of package yast2-ruby-bindings for openSUSE:13.1 checked in at 2013-09-23 11:24:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:13.1/yast2-ruby-bindings (Old)
and /work/SRC/openSUSE:13.1/.yast2-ruby-bindings.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-ruby-bindings"
Changes:
--------
--- /work/SRC/openSUSE:13.1/yast2-ruby-bindings/yast2-ruby-bindings.changes 2013-09-23 11:16:24.000000000 +0200
+++ /work/SRC/openSUSE:13.1/.yast2-ruby-bindings.new/yast2-ruby-bindings.changes 2013-09-23 11:24:29.000000000 +0200
@@ -1,0 +2,31 @@
+Thu Sep 12 07:53:00 UTC 2013 - jreidinger@suse.com
+
+- fix loading rubygems in embedded ruby
+- when client raise exception set proper exit code
+- 3.0.3
+
+-------------------------------------------------------------------
+Wed Sep 11 14:58:20 UTC 2013 - jreidinger@suse.com
+
+- remove workaround for ruby 1.9 as only 2.0 is supported
+ (to really fix $0 and ARGV, gh#yast/yast-ruby-bindings#74)
+- do not link against UI plugin, because showing UI without y2base
+ is not supported
+ (may fix a Jenkins failure)
+- 3.0.2
+
+-------------------------------------------------------------------
+Wed Sep 11 13:26:46 UTC 2013 - mvidner@suse.com
+
+- link to owcrypt only if it exists (fixes 12.3 builds)
+
+-------------------------------------------------------------------
+Wed Sep 11 11:47:35 UTC 2013 - jreidinger@suse.com
+
+- do not overwrite script name which require yast
+ gh#yast/yast-ruby-bindings#73,74
+- crypt_gensalt moved to separate library libowcrypt (fate#314945)
+ (thanks to Andreas Schwab )
+- 3.0.1
+
+-------------------------------------------------------------------
Old:
----
yast2-ruby-bindings-3.0.0.tar.bz2
New:
----
yast2-ruby-bindings-3.0.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-ruby-bindings.spec ++++++
--- /var/tmp/diff_new_pack.TEGMGe/_old 2013-09-23 11:24:30.000000000 +0200
+++ /var/tmp/diff_new_pack.TEGMGe/_new 2013-09-23 11:24:30.000000000 +0200
@@ -21,7 +21,7 @@
#
Name: yast2-ruby-bindings
-Version: 3.0.0
+Version: 3.0.3
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: yast2-ruby-bindings-%{version}.tar.bz2
++++++ yast2-ruby-bindings-3.0.0.tar.bz2 -> yast2-ruby-bindings-3.0.3.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ruby-bindings-3.0.0/VERSION.cmake new/yast2-ruby-bindings-3.0.3/VERSION.cmake
--- old/yast2-ruby-bindings-3.0.0/VERSION.cmake 2013-07-30 10:22:06.000000000 +0200
+++ new/yast2-ruby-bindings-3.0.3/VERSION.cmake 2013-09-12 14:16:52.000000000 +0200
@@ -1,3 +1,3 @@
SET(VERSION_MAJOR "3")
SET(VERSION_MINOR "0")
-SET(VERSION_PATCH "0")
+SET(VERSION_PATCH "3")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ruby-bindings-3.0.0/package/yast2-ruby-bindings.changes new/yast2-ruby-bindings-3.0.3/package/yast2-ruby-bindings.changes
--- old/yast2-ruby-bindings-3.0.0/package/yast2-ruby-bindings.changes 2013-07-30 10:22:06.000000000 +0200
+++ new/yast2-ruby-bindings-3.0.3/package/yast2-ruby-bindings.changes 2013-09-12 14:16:52.000000000 +0200
@@ -1,4 +1,35 @@
-------------------------------------------------------------------
+Thu Sep 12 07:53:00 UTC 2013 - jreidinger@suse.com
+
+- fix loading rubygems in embedded ruby
+- when client raise exception set proper exit code
+- 3.0.3
+
+-------------------------------------------------------------------
+Wed Sep 11 14:58:20 UTC 2013 - jreidinger@suse.com
+
+- remove workaround for ruby 1.9 as only 2.0 is supported
+ (to really fix $0 and ARGV, gh#yast/yast-ruby-bindings#74)
+- do not link against UI plugin, because showing UI without y2base
+ is not supported
+ (may fix a Jenkins failure)
+- 3.0.2
+
+-------------------------------------------------------------------
+Wed Sep 11 13:26:46 UTC 2013 - mvidner@suse.com
+
+- link to owcrypt only if it exists (fixes 12.3 builds)
+
+-------------------------------------------------------------------
+Wed Sep 11 11:47:35 UTC 2013 - jreidinger@suse.com
+
+- do not overwrite script name which require yast
+ gh#yast/yast-ruby-bindings#73,74
+- crypt_gensalt moved to separate library libowcrypt (fate#314945)
+ (thanks to Andreas Schwab )
+- 3.0.1
+
+-------------------------------------------------------------------
Tue Jul 30 08:02:01 UTC 2013 - yast-devel@opensuse.org
- version 3.0.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ruby-bindings-3.0.0/package/yast2-ruby-bindings.spec new/yast2-ruby-bindings-3.0.3/package/yast2-ruby-bindings.spec
--- old/yast2-ruby-bindings-3.0.0/package/yast2-ruby-bindings.spec 2013-07-30 10:22:52.000000000 +0200
+++ new/yast2-ruby-bindings-3.0.3/package/yast2-ruby-bindings.spec 2013-09-11 17:22:40.000000000 +0200
@@ -21,7 +21,7 @@
#
Name: yast2-ruby-bindings
-Version: 3.0.0
+Version: 3.0.2
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: yast2-ruby-bindings-%{version}.tar.bz2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ruby-bindings-3.0.0/src/binary/CMakeLists.txt new/yast2-ruby-bindings-3.0.3/src/binary/CMakeLists.txt
--- old/yast2-ruby-bindings-3.0.0/src/binary/CMakeLists.txt 2013-06-20 22:20:53.000000000 +0200
+++ new/yast2-ruby-bindings-3.0.3/src/binary/CMakeLists.txt 2013-09-11 17:22:00.000000000 +0200
@@ -84,7 +84,6 @@
# (e.g. through Y2CCWFM), thus we must link against the plugin libs
# and set the executables 'rpath' accordingly
#
-target_link_libraries( yastx ${YAST_PLUGIN_UI_LIBRARY} )
target_link_libraries( yastx ${RUBY_LIBRARY} )
target_link_libraries( builtinx ${YAST_LIBRARY} )
@@ -92,6 +91,10 @@
target_link_libraries( builtinx ${YAST_PLUGIN_SCR_LIBRARY} )
target_link_libraries( builtinx ${YAST_PLUGIN_WFM_LIBRARY} )
target_link_libraries( builtinx crypt )
+find_library( OWCRYPT_LIBRARY owcrypt )
+if ( OWCRYPT_LIBRARY )
+ target_link_libraries( builtinx ${OWCRYPT_LIBRARY} )
+endif()
install(TARGETS yastx LIBRARY DESTINATION ${RUBY_VENDORARCH_DIR} )
install(TARGETS builtinx LIBRARY DESTINATION ${RUBY_VENDORARCH_DIR}/yast )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ruby-bindings-3.0.0/src/binary/YRuby.cc new/yast2-ruby-bindings-3.0.3/src/binary/YRuby.cc
--- old/yast2-ruby-bindings-3.0.0/src/binary/YRuby.cc 2013-06-20 22:20:53.000000000 +0200
+++ new/yast2-ruby-bindings-3.0.3/src/binary/YRuby.cc 2013-09-12 14:16:52.000000000 +0200
@@ -37,6 +37,7 @@
#include
#include
+#include
#include "YRuby.h"
@@ -63,18 +64,20 @@
RUBY_INIT_STACK;
ruby_init();
- // call ruby_process_options to invoke prelude.rb which defines Mutex#synchronize
- // see http://www.ruby-forum.com/topic/4408161
- static char* args[] = { (char *)"ruby", (char *)"/dev/null" };
- ruby_process_options(2, args);
- ruby_script("yast");
ruby_init_loadpath();
+ // FIX for setup gem load path. Embedded ruby initialization mixes up gem
+ // initialization (which we want) with option processing (which we don't want).
+ // Copying only needed parts of `ruby_options` here.
+ // See http://subforge.org/blogs/show/1
+ // Note that the solution is different to not touch internal ruby
+ rb_define_module("Gem");
+ rb_require("rubygems");
+
rb_enc_find_index("encdb");
VALUE ycp_references = Data_Wrap_Struct(rb_cObject, gc_mark, gc_free, & value_references_from_ycp);
rb_global_variable(&ycp_references);
-// rb_gc_disable();
}
void YRuby::gc_mark(void *object)
@@ -233,7 +236,7 @@
VALUE trace = rb_gv_get("$@"); /* get last exception trace */
VALUE backtrace = RARRAY_LEN(trace)>0 ? rb_ary_entry(trace, 0) : rb_str_new2("Unknown");
y2error("cannot require yast:%s at %s", StringValuePtr(reason),StringValuePtr(backtrace));
- return YCPVoid();
+ return YCPBoolean(false);
}
VALUE wfm_module = y2ruby_nested_const_get("Yast::WFM");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ruby-bindings-3.0.0/src/ruby/yast/wfm.rb new/yast2-ruby-bindings-3.0.3/src/ruby/yast/wfm.rb
--- old/yast2-ruby-bindings-3.0.0/src/ruby/yast/wfm.rb 2013-07-26 23:26:50.000000000 +0200
+++ new/yast2-ruby-bindings-3.0.3/src/ruby/yast/wfm.rb 2013-09-12 14:16:52.000000000 +0200
@@ -87,7 +87,7 @@
e.message,
e.backtrace
)
- return nil
+ return false
ensure
# unload the client class to ensure that the includes will be
# fully initialized when running it next time
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
