File ruby1.9-patch of Package yast2-ruby-bindings

Overview Repositories Revisions Requests Users Attributes Meta

File ruby1.9-patch of Package yast2-ruby-bindings (Revision 0509c6b91f2edade493d1133771ca089)

Currently displaying revision 0509c6b91f2edade493d1133771ca089 , Show latest

Nur in /var/tmp/build-root-openSUSE_Factory-x86_64-YaST:Head-yast2-ruby-bindings/home/abuild/rpmbuild/BUILD/yast2-ruby-bindings-0.3.11/: build.
Nur in /var/tmp/build-root-openSUSE_Factory-x86_64-YaST:Head-yast2-ruby-bindings/home/abuild/rpmbuild/BUILD/yast2-ruby-bindings-0.3.11/: core.
Index: yast2-ruby-bindings-0.3.11/src/ruby/Y2RubyTypeConv.cc
===================================================================
--- yast2-ruby-bindings-0.3.11.orig/src/ruby/Y2RubyTypeConv.cc	2012-06-07 17:45:44.000000000 +0200
+++ yast2-ruby-bindings-0.3.11/src/ruby/Y2RubyTypeConv.cc	2012-06-12 15:30:25.171419923 +0200
@@ -104,6 +104,10 @@ static void ycpexternal_finalizer(void *
 {
   VALUE value = (VALUE)value_v;
 
+  if (!YRuby::yRuby()) {
+    return; // we're finalized
+  }
+
   YRuby::refcount_map_t& vrby = YRuby::yRuby()->value_references_from_ycp;
   YRuby::refcount_map_t::iterator it = vrby.find(value);
   if (it == vrby.end()) {
Index: yast2-ruby-bindings-0.3.11/src/ruby/YRuby.cc
===================================================================
--- yast2-ruby-bindings-0.3.11.orig/src/ruby/YRuby.cc	2012-06-07 17:45:44.000000000 +0200
+++ yast2-ruby-bindings-0.3.11/src/ruby/YRuby.cc	2012-06-12 15:31:25.430593704 +0200
@@ -28,6 +28,7 @@ as published by the Free Software Founda
 
 // Ruby stuff
 #include <ruby.h>
+#include <ruby/encoding.h>
 
 
 #define y2log_component "Y2Ruby"
@@ -68,14 +69,19 @@ void inject_last_exception_method(VALUE&
 }
 
 YRuby * YRuby::_yRuby = 0;
+bool YRuby::_y_ruby_finalized = false;
 
 YRuby::YRuby()
 {
   y2milestone( "Initializing ruby interpreter." );
+  
+  RUBY_INIT_STACK;
   ruby_init();
   ruby_script("yast");
   ruby_init_loadpath();
 
+  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);
 }
@@ -107,13 +113,14 @@ YRuby::~YRuby()
 {
     y2milestone( "Shutting down ruby interpreter." );
     ruby_finalize();
+    _y_ruby_finalized = true;
 }
 
 
 YRuby *
 YRuby::yRuby()
 {
-  if ( ! _yRuby )
+  if ( ! _yRuby && !_y_ruby_finalized )
     _yRuby = new YRuby();
 
   return _yRuby;
@@ -142,8 +149,9 @@ YRuby::loadModule( YCPList argList )
   if ( argList->size() != 2 || ! argList->value(0)->isString() || ! argList->value(1)->isString() )
     return YCPError( "Ruby::loadModule() / Ruby::Use() : Bad arguments: String expected!" );
   string module_path = argList->value(1)->asString()->value();
-  VALUE result = rb_require(module_path.c_str());
-  if ( result == Qfalse )
+  int error = 0;
+  VALUE result = rb_protect( (VALUE (*)(VALUE))rb_require, (VALUE) module_path.c_str(), &error);
+  if ( result == Qfalse || error)
     return YCPError( "Ruby::loadModule() / Can't load ruby module '" + module_path + "'" );
   return YCPVoid();
 }
Index: yast2-ruby-bindings-0.3.11/src/ruby/YRuby.h
===================================================================
--- yast2-ruby-bindings-0.3.11.orig/src/ruby/YRuby.h	2012-06-07 17:45:44.000000000 +0200
+++ yast2-ruby-bindings-0.3.11/src/ruby/YRuby.h	2012-06-12 15:30:25.172419876 +0200
@@ -113,6 +113,7 @@ private:
 
 public:
     static YRuby *	_yRuby;
+    static bool  _y_ruby_finalized;
     refcount_map_t value_references_from_ycp;
 };
 
Index: yast2-ruby-bindings-0.3.11/src/ruby/YRubyNamespace.cc
===================================================================
--- yast2-ruby-bindings-0.3.11.orig/src/ruby/YRubyNamespace.cc	2012-06-07 17:45:44.000000000 +0200
+++ yast2-ruby-bindings-0.3.11/src/ruby/YRubyNamespace.cc	2012-06-12 15:30:42.571603816 +0200
@@ -194,6 +194,9 @@ YRubyNamespace::YRubyNamespace (string n
   for(i = 0; i < RARRAY_LEN(methods); i++)
   {
     VALUE current = rb_funcall( methods, rb_intern("at"), 1, rb_fix_new(i) );
+    if (rb_type(current) == RUBY_T_SYMBOL) {
+	current = rb_funcall( current, rb_intern("to_s"), 0);
+    }
     y2milestone("New method: '%s'", RSTRING_PTR(current));
     
     // figure out arity.

Places

File ruby1.9-patch of Package yast2-ruby-bindings (Revision 0509c6b91f2edade493d1133771ca089)

Places