February 2012 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r67450 - /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:25:00 2012 New Revision: 67450 URL: http://svn.opensuse.org/viewcvs/yast?rev=67450&view=rev Log: improve test to get better result 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:25:00 2012 @@ -3,14 +3,15 @@ import "InRuby"; string result = tostring(InRuby::multiply_by_eight(10)); y2milestone("result: %1", result); - if (InRuby::raising_code()==nil) + result = tostring(InRuby::raising_code()); + if (result==nil) { - string result = tostring(InRuby::last_exception()); + result = tostring(InRuby::last_exception()); y2milestone("result: %1", result); } else { - y2error("exception completely ignored"); + y2error("exception completely ignored result: %1",result); } 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] r67449 - in /trunk/s390/src: dasd/dialogs.ycp modules/DASDController.ycp
by aschnell＠svn2.opensuse.org 15 Feb '12

15 Feb '12

Author: aschnell Date: Wed Feb 15 16:24:13 2012 New Revision: 67449 URL: http://svn.opensuse.org/viewcvs/yast?rev=67449&view=rev Log: - removed unused parameter from FormatDisks Modified: trunk/s390/src/dasd/dialogs.ycp trunk/s390/src/modules/DASDController.ycp Modified: trunk/s390/src/dasd/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/dasd/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/dasd/dialogs.ycp (original) +++ trunk/s390/src/dasd/dialogs.ycp Wed Feb 15 16:24:13 2012 @@ -445,7 +445,7 @@ list<string> devices = maplist (integer id, selected, { return DASDController::devices[id, "dev_name"]:""; }); - DASDController::FormatDisks (devices, par, write_vl, true); + DASDController::FormatDisks(devices, par, write_vl); DASDController::ProbeDisks(); ReloadDASDDialog (); UI::SetFocus (`table); 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 16:24:13 2012 @@ -32,17 +32,12 @@ global void ActivateDisk (string channel, boolean diag); global void DeactivateDisk (string channel, boolean diag); global void ProbeDisks (); -global void FormatDisks (list<string> disks_list, integer par, - boolean write_vl, boolean interactive); +global void FormatDisks(list<string> disks_list, integer par, boolean write_vl); global string GetPartitionInfo (string disk); - -boolean disk_configured = false; +global boolean GetModified(); -/** - * Prototypes - */ -global boolean Modified(); +boolean disk_configured = false; /** @@ -60,7 +55,8 @@ * Abort function * return boolean return true if abort */ -global boolean() AbortFunction = Modified; +global boolean() AbortFunction = GetModified; + /** * Abort function @@ -93,7 +89,8 @@ * Is this kind of disk controller available? * @return boolean true if it is */ -global boolean Available () { +global boolean Available() +{ return true; } @@ -124,7 +121,7 @@ { ProbeDisks(); - if (Mode::config()) + if (Mode::config()) // TODO { devices = mapmap(integer index, map<string, any> d, devices, { d["format"] = d["format"]:false; @@ -144,7 +141,7 @@ */ global boolean Write() { - if (Mode::config()) + if (Mode::config()) // TODO { list<string> to_format = []; @@ -165,7 +162,7 @@ y2milestone ("Disks to format: %1", to_format); if (!isempty(to_format)) - FormatDisks(to_format, 8, true, true); + FormatDisks(to_format, 8, true); } if (disk_configured && Mode::normal ()) @@ -214,12 +211,9 @@ global map<string, list> Export() { list<map<string, any> > l = maplist(integer i, map<string, any> d, devices, { - - d = filter(string k, any v, d, { + return filter(string k, any v, d, { return contains([ "channel", "format", "diag" ], k); }); - - return d; }); return $[ "devices" : l ]; @@ -290,7 +284,7 @@ list<string> ret = maplist (integer index, map<string,any> d, devices, { // summary text, %1 is channel ID (number), // %2 and %3 are Yes or No - return sformat(_("Channel: %1, Format: %2, Use DIAG: %3"), d["channel"]:"", + return sformat(_("Channel: %1, Format: %2, DIAG: %3"), d["channel"]:"", String::YesNo(d["format"]:false), String::YesNo(d["diag"]:false)); }); y2milestone ("Summary: %1", ret); @@ -485,8 +479,7 @@ string cmd = sformat("ls '/sys/bus/ccw/devices/%1/block/' | tr -d '\n'", channel); map<string, any> disk = (map<string, any>)SCR::Execute(.target.bash_output, cmd); if (disk["exit"]:-1 == 0 && size(disk["stdout"]:"")>0){ - FormatDisks ([ sformat("/dev/%1", disk["stdout"]:"") ], 1, true, true); -// ReloadDASDDialog (); + FormatDisks([ sformat("/dev/%1", disk["stdout"]:"") ], 1, true); ActivateDisk(channel, diag); } else { Popup::Error(sformat("Couldn't find device for %1 channel", channel)); @@ -528,10 +521,8 @@ * @param disks_list list<string> List of disks to be formated * @param par integer Number of disks that can be formated in parallel * @param write_vl boolean Write a Volume label - * @param interactive boolean Interactive yes/no */ -global void FormatDisks(list<string> disks_list, integer par, boolean write_vl, - boolean interactive) +global void FormatDisks(list<string> disks_list, integer par, boolean write_vl) { if (par > size (disks_list)) par = size (disks_list); -- 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] r67448 - /trunk/ruby-bindings/src/ruby/YRubyNamespace.cc
by jreidinger＠svn2.opensuse.org 15 Feb '12

15 Feb '12

Author: jreidinger Date: Wed Feb 15 15:54:23 2012 New Revision: 67448 URL: http://svn.opensuse.org/viewcvs/yast?rev=67448&view=rev Log: at first define method last_exception so you can call it from ycp Modified: trunk/ruby-bindings/src/ruby/YRubyNamespace.cc Modified: trunk/ruby-bindings/src/ruby/YRubyNamespace.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/src/ruby/YRubyName… ============================================================================== --- trunk/ruby-bindings/src/ruby/YRubyNamespace.cc (original) +++ trunk/ruby-bindings/src/ruby/YRubyNamespace.cc Wed Feb 15 15:54:23 2012 @@ -253,6 +253,18 @@ enterSymbol (fun_se, 0); y2milestone("method: '%s' added", RSTRING(current)->ptr); } + //add to all modules method last_exception to get last exception raised inside module + constTypePtr sym_tp = Type::fromSignature("any()"); + // symbol entry for the function + SymbolEntry *fun_se = new SymbolEntry ( this, + i,// position. arbitrary numbering. + "last_exception", // passed to Ustring, no need to strdup + SymbolEntry::c_function, + sym_tp); + fun_se->setGlobal (true); + // enter it to the symbol table + enterSymbol (fun_se, 0); + y2milestone("method: 'last_exception' added"); y2milestone("%s", symbolsToString().c_str()); } -- 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] r67447 - /trunk/s390/src/dasd/dialogs.ycp
by aschnell＠svn2.opensuse.org 15 Feb '12

15 Feb '12

Author: aschnell Date: Wed Feb 15 15:08:11 2012 New Revision: 67447 URL: http://svn.opensuse.org/viewcvs/yast?rev=67447&view=rev Log: - tiny simplification Modified: trunk/s390/src/dasd/dialogs.ycp Modified: trunk/s390/src/dasd/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/dasd/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/dasd/dialogs.ycp (original) +++ trunk/s390/src/dasd/dialogs.ycp Wed Feb 15 15:08:11 2012 @@ -369,7 +369,7 @@ string problem = ""; foreach (integer id, selected, { boolean active = DASDController::devices[id, "resource", "io", 0, "active"]:false; - string access = DASDController::devices[id, "resource", "io", 0, "mode"]:"ro"); + string access = DASDController::devices[id, "resource", "io", 0, "mode"]:"ro"; if (!active) { // error report, %1 is device identification -- 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] r67446 - in /trunk/s390/src: dasd/dialogs.ycp modules/DASDController.ycp
by aschnell＠svn2.opensuse.org 15 Feb '12

15 Feb '12

Author: aschnell Date: Wed Feb 15 15:06:39 2012 New Revision: 67446 URL: http://svn.opensuse.org/viewcvs/yast?rev=67446&view=rev Log: - tiny simplification Modified: trunk/s390/src/dasd/dialogs.ycp trunk/s390/src/modules/DASDController.ycp Modified: trunk/s390/src/dasd/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/dasd/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/dasd/dialogs.ycp (original) +++ trunk/s390/src/dasd/dialogs.ycp Wed Feb 15 15:06:39 2012 @@ -369,14 +369,14 @@ string problem = ""; foreach (integer id, selected, { boolean active = DASDController::devices[id, "resource", "io", 0, "active"]:false; - string access = toupper(DASDController::devices[id, "resource", "io", 0, "mode"]:"RO"); - if (! active) + string access = DASDController::devices[id, "resource", "io", 0, "mode"]:"ro"); + if (!active) { // error report, %1 is device identification problem = sformat (_("Disk %1 is not active."), DASDController::devices[id, "channel"]:""); } - else if (tolower (access) != "rw") + else if (access != "rw") { problem = sformat ( // error report, %1 is device identification 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 15:06:39 2012 @@ -378,6 +378,8 @@ return $[ index : d ]; }); + y2milestone("probed dasds %1", devices); + UI::CloseDialog (); } @@ -550,7 +552,6 @@ disks_param, par, additional_param); y2milestone ("Running command %1", command); - index = 0; term contents = `VBox (`HSpacing (70)); index = 0; while (index < par) -- 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] r67445 - in /trunk/ruby-bindings/tests/ycp: InRuby.rb ruby_from_ycp.ycp
by jreidinger＠svn2.opensuse.org 15 Feb '12

15 Feb '12

Author: jreidinger Date: Wed Feb 15 15:00:15 2012 New Revision: 67445 URL: http://svn.opensuse.org/viewcvs/yast?rev=67445&view=rev Log: first test to play with exceptions in ruby-bindings ( I hope we switch to git in near future and hope that noone need to submit ruby-bindings until I implement it ) Modified: trunk/ruby-bindings/tests/ycp/InRuby.rb trunk/ruby-bindings/tests/ycp/ruby_from_ycp.ycp Modified: trunk/ruby-bindings/tests/ycp/InRuby.rb URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/tests/ycp/InRuby.r… ============================================================================== --- trunk/ruby-bindings/tests/ycp/InRuby.rb (original) +++ trunk/ruby-bindings/tests/ycp/InRuby.rb Wed Feb 15 15:00:15 2012 @@ -2,4 +2,8 @@ def self.multiply_by_eight(n) n * 8 end + + def self.raising_code + raise "Wow exception!" + end end 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 15:00:15 2012 @@ -3,6 +3,15 @@ import "InRuby"; string result = tostring(InRuby::multiply_by_eight(10)); y2milestone("result: %1", result); + if (InRuby::raising_code()==nil) + { + string result = tostring(InRuby::last_exception()); + y2milestone("result: %1", result); + } + else + { + y2error("exception completely ignored"); + } import "CamelCase"; result = tostring(CamelCase::inc(10)); y2milestone("result: %1", 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] r67444 - in /trunk/s390/src: dasd/dialogs.ycp modules/DASDController.ycp
by aschnell＠svn2.opensuse.org 15 Feb '12

15 Feb '12

Author: aschnell Date: Wed Feb 15 14:52:22 2012 New Revision: 67444 URL: http://svn.opensuse.org/viewcvs/yast?rev=67444&view=rev Log: - added basic input checks Modified: trunk/s390/src/dasd/dialogs.ycp trunk/s390/src/modules/DASDController.ycp Modified: trunk/s390/src/dasd/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/dasd/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/dasd/dialogs.ycp (original) +++ trunk/s390/src/dasd/dialogs.ycp Wed Feb 15 14:52:22 2012 @@ -214,9 +214,6 @@ */ void ReloadDASDDialog() { - DASDController::filter_min = (string) UI::QueryWidget(`min_chan, `Value); - DASDController::filter_max = (string) UI::QueryWidget(`max_chan, `Value); - list<term> items = GetDASDDiskItems(); list<integer> selected = (list<integer>) UI::QueryWidget(`id(`table), `SelectedItems); @@ -242,6 +239,20 @@ if (ret == `filter) { + string filter_min = (string) UI::QueryWidget(`min_chan, `Value); + string filter_max = (string) UI::QueryWidget(`max_chan, `Value); + + if (!DASDController::ValidChannel(filter_min) || !DASDController::ValidChannel(filter_max)) + { + // error popup + Popup::Error(_("Invalid filter channels.")); + ret = nil; + continue; + } + + DASDController::filter_min = filter_min; + DASDController::filter_max = filter_max; + ReloadDASDDialog (); ret = nil; continue; @@ -499,10 +510,24 @@ { ret = nil; } - } + } else if (ret == `next) { - // TODO check for duplicate channel + string channel = (string) UI::QueryWidget(`id(`channel), `Value); + + if (!DASDController::ValidChannel(channel)) + { + // error popup + Popup::Error(_("Not a valid channel.")); + ret = nil; + } + + if (DASDController::GetDeviceIndex(channel) != nil) + { + // error popup + Popup::Error(_("Channel already exists.")); + ret = nil; + } } } @@ -511,7 +536,8 @@ string channel = (string) UI::QueryWidget(`id(`channel), `Value); boolean format = (boolean) UI::QueryWidget(`id(`format), `Value); boolean diag = (boolean) UI::QueryWidget(`id(`diag), `Value); - map<string,any> m = $[ + + map<string, any> d = $[ "channel" : channel, "format" : format, "diag" : diag, @@ -520,7 +546,7 @@ integer index = 0; while (haskey (DASDController::devices, index)) index = index + 1; - DASDController::devices[index] = m; + DASDController::devices[index] = d; } return ret; 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 14:52:22 2012 @@ -109,6 +109,13 @@ } + global boolean ValidChannel(string channel) + { + string regexp = "^([0-9a-fA-F]{1}).([0-9a-fA-F]{1}).([0-9a-fA-F]{4})$"; + return regexpmatch(channel, regexp); + } + + /** * Read all controller settings * @return true on success @@ -261,6 +268,18 @@ return ret; } + + global integer + GetDeviceIndex(string channel) + { + integer ret = nil; + foreach(integer index , map<string, any> d, DASDController::devices, { + if (d["channel"]:"0.0.0000" == channel) + ret = index; + }); + return ret; + } + /** * Create a textual summary and a list of unconfigured cards -- 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] r67443 - /trunk/yast2/library/modules/FileUtils.ycp
by gs＠svn2.opensuse.org 15 Feb '12

15 Feb '12

Author: gs Date: Wed Feb 15 14:17:24 2012 New Revision: 67443 URL: http://svn.opensuse.org/viewcvs/yast?rev=67443&view=rev Log: improve Exists(), don't return 'true' if SCR::Read() returned nil Modified: trunk/yast2/library/modules/FileUtils.ycp Modified: trunk/yast2/library/modules/FileUtils.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/modules/FileUtils.… ============================================================================== --- trunk/yast2/library/modules/FileUtils.ycp (original) +++ trunk/yast2/library/modules/FileUtils.ycp Wed Feb 15 14:17:24 2012 @@ -33,7 +33,7 @@ global define boolean Exists (string target) { map info = (map) SCR::Read(.target.stat, target); - if (info != $[]) { + if (info != $[] && info != nil) { return true; } return false; -- 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] r67442 - /trunk/ycp-ui-bindings/examples/RichText2.ycp
by gs＠svn2.opensuse.org 15 Feb '12

15 Feb '12

Author: gs Date: Wed Feb 15 14:12:27 2012 New Revision: 67442 URL: http://svn.opensuse.org/viewcvs/yast?rev=67442&view=rev Log: add tabs to example Modified: trunk/ycp-ui-bindings/examples/RichText2.ycp Modified: trunk/ycp-ui-bindings/examples/RichText2.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/examples/RichTex… ============================================================================== --- trunk/ycp-ui-bindings/examples/RichText2.ycp (original) +++ trunk/ycp-ui-bindings/examples/RichText2.ycp Wed Feb 15 14:12:27 2012 @@ -4,8 +4,9 @@ `VBox( `RichText(`opt(`plainText), "This is a RichText in plainText mode.\n" - +"No HTML tags are supported here, but line breaks\n" - +"are output literally - as are HTML tags like <b> or <i> or &product;." + +"No HTML \t\ttags\tare\tsupported\there, tabs\tand\tline\tbreaks\n" + +"are output literally \n" + +"as are HTML tags like <b> or <i> or &product;." ), `PushButton(`opt(`default), "&OK") ) -- 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] r67441 - /trunk/ycp-ui-bindings/examples/LogView2.ycp
by gs＠svn2.opensuse.org 15 Feb '12

15 Feb '12

Author: gs Date: Wed Feb 15 14:08:22 2012 New Revision: 67441 URL: http://svn.opensuse.org/viewcvs/yast?rev=67441&view=rev Log: add \n to lines (needed to work in text mode) Modified: trunk/ycp-ui-bindings/examples/LogView2.ycp Modified: trunk/ycp-ui-bindings/examples/LogView2.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/examples/LogView… ============================================================================== --- trunk/ycp-ui-bindings/examples/LogView2.ycp (original) +++ trunk/ycp-ui-bindings/examples/LogView2.ycp Wed Feb 15 14:08:22 2012 @@ -16,6 +16,7 @@ repeat { string line = tostring(random(100)); + line = line + "\n"; UI::ChangeWidget(`id(`log), `LastLine, line ); button = UI::TimeoutUserInput(100); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0