February 2012 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r67460 - /trunk/s390/src/clients/s390-disk-controller.ycp
by aschnell＠svn2.opensuse.org 16 Feb '12

16 Feb '12

Author: aschnell Date: Thu Feb 16 12:12:06 2012 New Revision: 67460 URL: http://svn.opensuse.org/viewcvs/yast?rev=67460&view=rev Log: - removed one of two return statements Modified: trunk/s390/src/clients/s390-disk-controller.ycp Modified: trunk/s390/src/clients/s390-disk-controller.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/clients/s390-disk-contr… ============================================================================== --- trunk/s390/src/clients/s390-disk-controller.ycp (original) +++ trunk/s390/src/clients/s390-disk-controller.ycp Thu Feb 16 12:12:06 2012 @@ -8,16 +8,9 @@ * * Main file for controller configuration. Uses all other files. */ - { - -/*** - * <h3>Configuration of controller</h3> - */ - textdomain "s390"; -/* The main () */ y2milestone ("----------------------------------------"); y2milestone ("S/390 Controller module started"); @@ -94,15 +87,11 @@ } UI::CloseDialog(); -return ret; y2debug("ret=%1", ret); -/* Finish */ y2milestone("S/390 controller module finished"); y2milestone("----------------------------------------"); return ret; - -/* EOF */ } -- 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] r67459 - /trunk/s390/src/modules/DASDController.ycp
by aschnell＠svn2.opensuse.org 16 Feb '12

16 Feb '12

Author: aschnell Date: Thu Feb 16 11:42:21 2012 New Revision: 67459 URL: http://svn.opensuse.org/viewcvs/yast?rev=67459&view=rev Log: - removed unneeded scope operator Modified: trunk/s390/src/modules/DASDController.ycp Modified: trunk/s390/src/modules/DASDController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/DASDController.… ============================================================================== --- trunk/s390/src/modules/DASDController.ycp (original) +++ trunk/s390/src/modules/DASDController.ycp Thu Feb 16 11:42:21 2012 @@ -279,7 +279,7 @@ GetDeviceIndex(string channel) { integer ret = nil; - foreach(integer index , map<string, any> d, DASDController::devices, { + foreach(integer index , map<string, any> d, devices, { if (d["channel"]:"0.0.0000" == channel) ret = index; }); -- 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] r67458 - /trunk/s390/src/modules/DASDController.ycp
by aschnell＠svn2.opensuse.org 15 Feb '12

15 Feb '12

Author: aschnell Date: Wed Feb 15 18:24:56 2012 New Revision: 67458 URL: http://svn.opensuse.org/viewcvs/yast?rev=67458&view=rev Log: - fixed mode queries in Read and Write Modified: trunk/s390/src/modules/DASDController.ycp Modified: trunk/s390/src/modules/DASDController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/DASDController.… ============================================================================== --- trunk/s390/src/modules/DASDController.ycp (original) +++ trunk/s390/src/modules/DASDController.ycp Wed Feb 15 18:24:56 2012 @@ -124,13 +124,17 @@ { ProbeDisks(); - if (Mode::config()) // TODO + if (!Mode::normal()) { + devices = filter(integer index, map<string, any> d, devices, { + return d["resource", "io", 0, "active"]:false; + }); + devices = mapmap(integer index, map<string, any> d, devices, { - d["format"] = d["format"]:false; - d["diag"] = d["diag"]:false; - return $[ index : d ]; - }); + d["format"] = d["format"]:false; + d["diag"] = d["diag"]:false; + return $[ index : d ]; + }); } disk_configured = false; @@ -144,50 +148,50 @@ */ global boolean Write() { - if (Mode::config()) // TODO + if (!Mode::normal()) { - list<string> to_format = []; - - foreach(integer index, map<string, any> device, devices, { - string channel = device["channel"]:""; - boolean format = device["format"]:false; - boolean do_diag = device["diag"]:false; - ActivateDisk(channel, do_diag); + list<string> to_format = []; - if (format) - { - string dev_name = GetDeviceName(channel); - if (dev_name != nil) - to_format = add(to_format, dev_name); - } - }); + foreach(integer index, map<string, any> device, devices, { + string channel = device["channel"]:""; + boolean format = device["format"]:false; + boolean do_diag = device["diag"]:false; + ActivateDisk(channel, do_diag); + + if (format) + { + string dev_name = GetDeviceName(channel); + if (dev_name != nil) + to_format = add(to_format, dev_name); + } + }); - y2milestone ("Disks to format: %1", to_format); + y2milestone ("Disks to format: %1", to_format); - if (!isempty(to_format)) - FormatDisks(to_format, 8, true); + if (!isempty(to_format)) + FormatDisks(to_format, 8, true); } - if (disk_configured && Mode::normal ()) + if (!Mode::installation()) { - // popup label - UI::OpenDialog(`Label(_("Running mkinitrd and zipl."))); + if (disk_configured) + { + // popup label + UI::OpenDialog(`Label(_("Running mkinitrd and zipl."))); - string command = "/sbin/mkinitrd && /sbin/zipl"; - y2milestone ("Running command %1", command); - any ret = SCR::Execute (.target.bash, command); - y2milestone ("Exit code: %1", ret); + string command = "/sbin/mkinitrd && /sbin/zipl"; + y2milestone("Running command %1", command); + any ret = SCR::Execute(.target.bash, command); + y2milestone ("Exit code: %1", ret); - UI::CloseDialog(); - } - else - { - y2milestone ("No new disk configured"); + UI::CloseDialog(); + } } return true; } + /** * Get all controller settings from the first parameter * (For use by autoinstallation.) @@ -198,7 +202,7 @@ { integer index = -1; devices = listmap (map<string, any> d, settings["devices"]:[], { - index = index + 1; + index = index + 1; d = filter(string k, any v, d, { return contains([ "channel", "format", "diag" ], k); @@ -588,7 +592,7 @@ string line = (string) SCR::Read(.process.read_line, process_id); if (line == nil) break; - + integer siz = tointeger (line); if (siz == 0) siz = 999999999; -- 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] r67457 - /trunk/s390/src/modules/DASDController.ycp
by aschnell＠svn2.opensuse.org 15 Feb '12

15 Feb '12

Author: aschnell Date: Wed Feb 15 18:00:00 2012 New Revision: 67457 URL: http://svn.opensuse.org/viewcvs/yast?rev=67457&view=rev Log: - added popup while running mkinitrd and zipl Modified: trunk/s390/src/modules/DASDController.ycp Modified: trunk/s390/src/modules/DASDController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/DASDController.… ============================================================================== --- trunk/s390/src/modules/DASDController.ycp (original) +++ trunk/s390/src/modules/DASDController.ycp Wed Feb 15 18:00:00 2012 @@ -37,6 +37,9 @@ global boolean GetModified(); +/** + * Have DASDs been configured so that mkinitrd and zipl need to be run? + */ boolean disk_configured = false; @@ -167,10 +170,15 @@ if (disk_configured && Mode::normal ()) { + // popup label + UI::OpenDialog(`Label(_("Running mkinitrd and zipl."))); + string command = "/sbin/mkinitrd && /sbin/zipl"; y2milestone ("Running command %1", command); any ret = SCR::Execute (.target.bash, command); y2milestone ("Exit code: %1", ret); + + UI::CloseDialog(); } else { -- 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] r67456 - in /trunk/s390/testsuite/tests: S390.out S390.ycp
by aschnell＠svn2.opensuse.org 15 Feb '12

15 Feb '12

Author: aschnell Date: Wed Feb 15 17:01:51 2012 New Revision: 67456 URL: http://svn.opensuse.org/viewcvs/yast?rev=67456&view=rev Log: - adapted testsuite Modified: trunk/s390/testsuite/tests/S390.out trunk/s390/testsuite/tests/S390.ycp Modified: trunk/s390/testsuite/tests/S390.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/testsuite/tests/S390.out?re… ============================================================================== --- trunk/s390/testsuite/tests/S390.out (original) +++ trunk/s390/testsuite/tests/S390.out Wed Feb 15 17:01:51 2012 @@ -1,2 +1,2 @@ -Dump DASDController::Modified +Dump DASDController::GetModified Return false Modified: trunk/s390/testsuite/tests/S390.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/testsuite/tests/S390.ycp?re… ============================================================================== --- trunk/s390/testsuite/tests/S390.ycp (original) +++ trunk/s390/testsuite/tests/S390.ycp Wed Feb 15 17:01:51 2012 @@ -7,7 +7,7 @@ import "DASDController"; -DUMP("DASDController::Modified"); -TEST(``(DASDController::Modified()), [], nil); +DUMP("DASDController::GetModified"); +TEST(``(DASDController::GetModified()), [], nil); } -- 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] r67455 - /trunk/s390/yast2-s390.spec.in
by aschnell＠svn2.opensuse.org 15 Feb '12

15 Feb '12

Author: aschnell Date: Wed Feb 15 16:58:11 2012 New Revision: 67455 URL: http://svn.opensuse.org/viewcvs/yast?rev=67455&view=rev Log: - updated build-requires Modified: trunk/s390/yast2-s390.spec.in Modified: trunk/s390/yast2-s390.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/yast2-s390.spec.in?rev=6745… ============================================================================== --- trunk/s390/yast2-s390.spec.in (original) +++ trunk/s390/yast2-s390.spec.in Wed Feb 15 16:58:11 2012 @@ -4,7 +4,7 @@ Group: System/YaST License: GPL-2.0+ BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files -BuildRequires: yast2 yast2-devtools yast2-testsuite +BuildRequires: yast2 yast2-devtools yast2-testsuite yast2-users yast2-bootloader ExclusiveArch: s390 s390x Requires: yast2 s390-tools -- 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] r67454 - /trunk/ruby-bindings/src/ruby/YRuby.cc
by jreidinger＠svn2.opensuse.org 15 Feb '12

15 Feb '12

Author: jreidinger Date: Wed Feb 15 16:53:47 2012 New Revision: 67454 URL: http://svn.opensuse.org/viewcvs/yast?rev=67454&view=rev Log: and implement injection of last exception message 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 Wed Feb 15 16:53:47 2012 @@ -56,6 +56,17 @@ #include "Y2RubyTypeConv.h" +void inject_last_exception_method(VALUE& module,const string& message, const string& module_name) +{ + //doing injection from C++ is quite complex, but we have eval, so we can do it in ruby :) + string code("module "); + code += module_name; + code += "\ndef self.last_exception\n'"; + code += message; + code += "'\nend\nend"; + rb_funcall(module, rb_intern("eval"), 1, rb_str_new2(code.c_str())); +} + static void prependModulePath() { YCPPathSearch::initialize (); @@ -248,6 +259,7 @@ { return YCPString(StringValuePtr(reason)); } + inject_last_exception_method(module,StringValuePtr(reason),module_name); return YCPVoid(); } else -- 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] r67453 - /trunk/ruby-bindings/tests/ycp/ruby_from_ycp.ycp
by jreidinger＠svn2.opensuse.org 15 Feb '12

15 Feb '12

Author: jreidinger Date: Wed Feb 15 16:51:53 2012 New Revision: 67453 URL: http://svn.opensuse.org/viewcvs/yast?rev=67453&view=rev Log: make test really fail if it doesn't return what we want Modified: trunk/ruby-bindings/tests/ycp/ruby_from_ycp.ycp Modified: trunk/ruby-bindings/tests/ycp/ruby_from_ycp.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/tests/ycp/ruby_fro… ============================================================================== --- trunk/ruby-bindings/tests/ycp/ruby_from_ycp.ycp (original) +++ trunk/ruby-bindings/tests/ycp/ruby_from_ycp.ycp Wed Feb 15 16:51:53 2012 @@ -8,10 +8,13 @@ { result = tostring(InRuby::last_exception()); y2milestone("result: %1", result); + if(result != "Wow exception!") + return false; } else { y2error("exception completely ignored result: %1",result); + return false; } import "CamelCase"; result = tostring(CamelCase::inc(10)); -- 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] r67452 - /trunk/ruby-bindings/src/ruby/YRuby.cc
by jreidinger＠svn2.opensuse.org 15 Feb '12

15 Feb '12

Author: jreidinger Date: Wed Feb 15 16:31:10 2012 New Revision: 67452 URL: http://svn.opensuse.org/viewcvs/yast?rev=67452&view=rev Log: fix memory leak in ruby bindings 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 Wed Feb 15 16:31:10 2012 @@ -242,6 +242,7 @@ 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); + free(tmp); //workaround if last_exception failed, then return always string with message if(function == "last_exception") //TODO constantify last_exception { -- 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] r67451 - /trunk/ruby-bindings/src/ruby/YRuby.cc
by jreidinger＠svn2.opensuse.org 15 Feb '12

15 Feb '12

Author: jreidinger Date: Wed Feb 15 16:26:08 2012 New Revision: 67451 URL: http://svn.opensuse.org/viewcvs/yast?rev=67451&view=rev Log: ensure that even if exception is raised we return correct result. Ensure also that for last_exception if exception is called, we still return string with message 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 Wed Feb 15 16:26:08 2012 @@ -236,12 +236,18 @@ if (error) { VALUE exception = rb_gv_get("$!"); /* get last exception */ - VALUE reason = rb_funcall(exception, rb_intern("to_s"), 0 ); + VALUE reason = rb_funcall(exception, rb_intern("message"), 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); + //workaround if last_exception failed, then return always string with message + if(function == "last_exception") //TODO constantify last_exception + { + return YCPString(StringValuePtr(reason)); + } + return YCPVoid(); } else { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0