July 2011 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r64993 - /tags/branch-Code-11-SP2-2_17_19/sound/
by lslezak＠svn2.opensuse.org 25 Jul '11

25 Jul '11

Author: lslezak Date: Mon Jul 25 16:24:12 2011 New Revision: 64993 URL: http://svn.opensuse.org/viewcvs/yast?rev=64993&view=rev Log: Created tag branch-Code-11-SP2-2_17_19 for sound Added: tags/branch-Code-11-SP2-2_17_19/sound/ (props changed) - copied from r64992, branches/SuSE-Code-11-SP2-Branch/sound/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r64992 - in /branches/SuSE-Code-11-SP2-Branch/sound: VERSION package/yast2-sound.changes sound/src/routines.ycp
by lslezak＠svn2.opensuse.org 25 Jul '11

25 Jul '11

Author: lslezak Date: Mon Jul 25 16:01:03 2011 New Revision: 64992 URL: http://svn.opensuse.org/viewcvs/yast?rev=64992&view=rev Log: - fixed hwinfo driver name conversion, fixed detection of sound cards missing in the sound card database (bnc#706992) - 2.17.19 Modified: branches/SuSE-Code-11-SP2-Branch/sound/VERSION branches/SuSE-Code-11-SP2-Branch/sound/package/yast2-sound.changes branches/SuSE-Code-11-SP2-Branch/sound/sound/src/routines.ycp Modified: branches/SuSE-Code-11-SP2-Branch/sound/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/sound… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/sound/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/sound/VERSION Mon Jul 25 16:01:03 2011 @@ -1 +1 @@ -2.17.18 +2.17.19 Modified: branches/SuSE-Code-11-SP2-Branch/sound/package/yast2-sound.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/sound… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/sound/package/yast2-sound.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/sound/package/yast2-sound.changes Mon Jul 25 16:01:03 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Jul 25 13:36:08 UTC 2011 - lslezak(a)suse.cz + +- fixed hwinfo driver name conversion, fixed detection of sound + cards missing in the sound card database (bnc#706992) +- 2.17.19 + +------------------------------------------------------------------- Thu Jul 7 15:09:01 UTC 2011 - lslezak(a)suse.cz - updated sound card database (kernel 2.6.32.41-0.5) Modified: branches/SuSE-Code-11-SP2-Branch/sound/sound/src/routines.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/sound… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/sound/sound/src/routines.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/sound/sound/src/routines.ycp Mon Jul 25 16:01:03 2011 @@ -678,11 +678,8 @@ // use value from hwinfo if present modname = card["drivers",0,"modules",0,0]:""; - // covert module name - hwinfo might use _ in module name prefix (e.g. snd_via82xx) - if (substring(modname, 0, size("snd_")) == "snd_") - { - modname = "snd-" + substring(modname, size("snd_")); - } + // convert module name - hwinfo might use _ in module name prefix (e.g. snd_via82xx) + modname = mergestring(splitstring(modname,"_"),"-"); if (modname != "") { @@ -705,7 +702,7 @@ map ret = Sound::db_modules [modname]:$[]; - if (ret != $[] && !haskey(ret, "name")) + if (!haskey(ret, "name")) { // we must supply the 'name' key with the module name ret = add(ret, "name", modname); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r64991 - in /trunk/ruby-bindings: VERSION.cmake package/yast2-ruby-bindings.changes
by kkaempf＠svn2.opensuse.org 25 Jul '11

25 Jul '11

Author: kkaempf Date: Mon Jul 25 15:30:08 2011 New Revision: 64991 URL: http://svn.opensuse.org/viewcvs/yast?rev=64991&view=rev Log: bump to 0.3.6 Modified: trunk/ruby-bindings/VERSION.cmake trunk/ruby-bindings/package/yast2-ruby-bindings.changes Modified: trunk/ruby-bindings/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/VERSION.cmake?rev=… ============================================================================== --- trunk/ruby-bindings/VERSION.cmake (original) +++ trunk/ruby-bindings/VERSION.cmake Mon Jul 25 15:30:08 2011 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "0") SET(VERSION_MINOR "3") -SET(VERSION_PATCH "5") +SET(VERSION_PATCH "6") Modified: trunk/ruby-bindings/package/yast2-ruby-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/package/yast2-ruby… ============================================================================== --- trunk/ruby-bindings/package/yast2-ruby-bindings.changes (original) +++ trunk/ruby-bindings/package/yast2-ruby-bindings.changes Mon Jul 25 15:30:08 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Jul 25 13:28:56 UTC 2011 - kkaempf(a)novell.com + +- wrap rb_funcall in rb_protect to prevent segfaults if the + calling function raises an exception (bnc#705425) +- 0.3.6 + +------------------------------------------------------------------- Tue Nov 3 12:43:21 UTC 2009 - dmacvicar(a)novell.com - support for nested namespaces (Foo::Bar) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r64990 - /trunk/ruby-bindings/src/ruby/YRuby.cc
by kkaempf＠svn2.opensuse.org 25 Jul '11

25 Jul '11

Author: kkaempf Date: Mon Jul 25 15:25:44 2011 New Revision: 64990 URL: http://svn.opensuse.org/viewcvs/yast?rev=64990&view=rev Log: simplify call to require(). Just call rb_require instead of rb_eval_string("require ...") Modified: trunk/ruby-bindings/src/ruby/YRuby.cc Modified: trunk/ruby-bindings/src/ruby/YRuby.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/src/ruby/YRuby.cc?… ============================================================================== --- trunk/ruby-bindings/src/ruby/YRuby.cc (original) +++ trunk/ruby-bindings/src/ruby/YRuby.cc Mon Jul 25 15:25:44 2011 @@ -126,9 +126,7 @@ string module_name = argList->value(0)->asString()->value(); string module_path = argList->value(1)->asString()->value(); //y2milestone("loadModule 3: '%s'", module_name.c_str()); - string require_module = "require(\"" + module_path + "\")"; - //y2milestone("loadModule 3.5"); - VALUE result = rb_eval_string((require_module).c_str()); + VALUE result = rb_require(module_path.c_str()); if ( result == Qfalse ) return YCPError( "Ruby::loadModule() / Can't load ruby module '" + module_path + "'" ); //y2milestone("loadModule 4"); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r64989 - /trunk/ruby-bindings/src/ruby/YRuby.cc
by kkaempf＠svn2.opensuse.org 25 Jul '11

25 Jul '11

Author: kkaempf Date: Mon Jul 25 15:23:02 2011 New Revision: 64989 URL: http://svn.opensuse.org/viewcvs/yast?rev=64989&view=rev Log: wrap rb_funcall() with rb_protect so exception can be thrown. Will segfault without it. + print a nice exception trace to y2log in case of error. Modified: trunk/ruby-bindings/src/ruby/YRuby.cc Modified: trunk/ruby-bindings/src/ruby/YRuby.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/src/ruby/YRuby.cc?… ============================================================================== --- trunk/ruby-bindings/src/ruby/YRuby.cc (original) +++ trunk/ruby-bindings/src/ruby/YRuby.cc Mon Jul 25 15:23:02 2011 @@ -20,6 +20,7 @@ */ #include <stdlib.h> +#include <stdarg.h> #include <list> #include <iosfwd> #include <sstream> @@ -135,6 +136,40 @@ } +// snprintf into a temp string +static char * +fmtstr(const char* fmt, ...) +{ + va_list ap; + int len; + char* str; + + va_start(ap, fmt); + len = vsnprintf(NULL, 0, fmt, ap); + va_end(ap); + if (len <= 0) + { + return NULL; + } + str = (char*)malloc(len+1); + if (str == NULL) + { + return NULL; + } + va_start(ap, fmt); + vsnprintf(str, len+1, fmt, ap); + va_end(ap); + return str; +} + + +// rb_protect-enabled rb_funcall, see below +static VALUE +protected_call(VALUE args) +{ + VALUE *values = (VALUE *)args; + return rb_funcall3(values[0], values[1], (int)values[2], values+3); +} /** * @param argList arguments start 1!, 0 is dummy @@ -155,20 +190,39 @@ // make rooms for size-1 arguments to // the ruby function - VALUE values[size-1]; + // +3 for module, function, and number of args + // to pass to protected_call() + VALUE values[size-1+3]; + int error; int i=0; for ( ; i < size-1; ++i ) { // get the YCPValue v = argList->value(i+1); y2milestone("Adding argument %d of type %s", i, v->valuetype_str()); - values[i] = ycpvalue_2_rbvalue(v); + values[i+3] = ycpvalue_2_rbvalue(v); } - y2milestone( "Wll call function '%s' in module '%s' with '%d' arguments", function.c_str(), module_name.c_str(), size-1); - VALUE result = rb_funcall2( module, rb_intern(function.c_str()), size-1, values ); + y2milestone( "Will call function '%s' in module '%s' with '%d' arguments", function.c_str(), module_name.c_str(), size-1); + values[0] = module; + values[1] = rb_intern(function.c_str()); + values[2] = size-1; + VALUE result = rb_protect(protected_call, (VALUE)values, &error); + if (error) + { + VALUE exception = rb_gv_get("$!"); /* get last exception */ + VALUE reason = rb_funcall(exception, rb_intern("to_s"), 0 ); + VALUE trace = rb_gv_get("$@"); /* get last exception trace */ + VALUE backtrace = rb_funcall(trace, rb_intern("join"), 1, rb_str_new("\n\t", 2)); + + char* tmp = fmtstr("%s\n\t%s", StringValuePtr(reason), StringValuePtr(backtrace)); + y2error("%s.%s failed\n%s", module_name.c_str(), function.c_str(), tmp); + } + else + { //VALUE result = rb_funcall( module, rb_intern(function.c_str()), 2, INT2NUM(2), INT2NUM(3) ); - y2milestone( "Called function '%s' in module '%s'", function.c_str(), module_name.c_str()); + y2milestone( "Called function '%s' in module '%s'", function.c_str(), module_name.c_str()); + } return rbvalue_2_ycpvalue(result); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r64988 - /tags/stable-2_21_0/firstboot/
by locilka＠svn2.opensuse.org 25 Jul '11

25 Jul '11

Author: locilka Date: Mon Jul 25 15:08:32 2011 New Revision: 64988 URL: http://svn.opensuse.org/viewcvs/yast?rev=64988&view=rev Log: Created tag stable-2_21_0 for firstboot Added: tags/stable-2_21_0/firstboot/ - copied from r64987, trunk/firstboot/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r64987 - in /trunk/firstboot: VERSION package/yast2-firstboot.changes
by locilka＠svn2.opensuse.org 25 Jul '11

25 Jul '11

Author: locilka Date: Mon Jul 25 15:00:21 2011 New Revision: 64987 URL: http://svn.opensuse.org/viewcvs/yast?rev=64987&view=rev Log: New version Modified: trunk/firstboot/VERSION trunk/firstboot/package/yast2-firstboot.changes Modified: trunk/firstboot/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/VERSION?rev=64987&r1=6… ============================================================================== --- trunk/firstboot/VERSION (original) +++ trunk/firstboot/VERSION Mon Jul 25 15:00:21 2011 @@ -1 +1 @@ -2.20.2 +2.21.0 Modified: trunk/firstboot/package/yast2-firstboot.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/firstboot/package/yast2-firstboo… ============================================================================== --- trunk/firstboot/package/yast2-firstboot.changes (original) +++ trunk/firstboot/package/yast2-firstboot.changes Mon Jul 25 15:00:21 2011 @@ -3,6 +3,7 @@ - Removed obsoleted X-KDE-SubstituteUID from desktop file (bnc#540627) +- 2.21.0 ------------------------------------------------------------------- Fri Feb 18 11:28:57 CET 2011 - jsuchome(a)suse.cz -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r64986 - /tags/stable-2_21_8/installation/
by locilka＠svn2.opensuse.org 25 Jul '11

25 Jul '11

Author: locilka Date: Mon Jul 25 14:55:01 2011 New Revision: 64986 URL: http://svn.opensuse.org/viewcvs/yast?rev=64986&view=rev Log: Created tag stable-2_21_8 for installation Added: tags/stable-2_21_8/installation/ - copied from r64985, trunk/installation/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r64985 - in /trunk/installation: VERSION package/yast2-installation.changes
by locilka＠svn2.opensuse.org 25 Jul '11

25 Jul '11

Author: locilka Date: Mon Jul 25 14:54:23 2011 New Revision: 64985 URL: http://svn.opensuse.org/viewcvs/yast?rev=64985&view=rev Log: New version Modified: trunk/installation/VERSION trunk/installation/package/yast2-installation.changes Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=64985&r… ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Mon Jul 25 14:54:23 2011 @@ -1 +1 @@ -2.21.7 +2.21.8 Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Mon Jul 25 14:54:23 2011 @@ -3,6 +3,7 @@ - Removed obsoleted X-KDE-SubstituteUID from deploy_image.desktop (bnc#540627) +- 2.21.8 ------------------------------------------------------------------- Tue Jul 12 15:34:38 CEST 2011 - jsuchome(a)suse.cz -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r64984 - /tags/stable-0_8_12/metapackage/
by locilka＠svn2.opensuse.org 25 Jul '11

25 Jul '11

Author: locilka Date: Mon Jul 25 14:15:41 2011 New Revision: 64984 URL: http://svn.opensuse.org/viewcvs/yast?rev=64984&view=rev Log: Created tag stable-0_8_12 for metapackage Added: tags/stable-0_8_12/metapackage/ - copied from r64983, trunk/metapackage/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0