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 or or &product;." + +"No HTML \t\ttags\tare\tsupported\there, tabs\tand\tline\tbreaks\n" + +"are output literally \n" + +"as are HTML tags like or 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

[yast-commit] r67440 - /trunk/ycp-ui-bindings/examples/RichText4.ycp
by gs＠svn2.opensuse.org 15 Feb '12

15 Feb '12

Author: gs Date: Wed Feb 15 14:07:27 2012 New Revision: 67440 URL: http://svn.opensuse.org/viewcvs/yast?rev=67440&view=rev Log: more text (<tt> tag) Modified: trunk/ycp-ui-bindings/examples/RichText4.ycp Modified: trunk/ycp-ui-bindings/examples/RichText4.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ycp-ui-bindings/examples/RichTex… ============================================================================== --- trunk/ycp-ui-bindings/examples/RichText4.ycp (original) +++ trunk/ycp-ui-bindings/examples/RichText4.ycp Wed Feb 15 14:07:27 2012 @@ -5,14 +5,23 @@ `RichText( "<h3>RichText example</h3>" + "This is a RichText widget." + "It's very much like HTML, but not quite as powerful." - + "bold and italic you can rely on." - + "-i-: keep the installed version and never update or delete it ( package locked )" - + " i : All requirements of this pattern/language are satisfied" + + "bold and italic you can rely on. " + + "But in text mode bold and italic it look the same." + + "Bold used for status:" + + "" + + "<pre>" + + "-i-: keep the installed version ( package locked ) " + + " i : All requirements of this pattern/language are satisfied" + + "</pre>" + + "" + + "Italic used for special info:" + + "Please read the Users Manual." + + "The <tt> typewriter tag is interpreted like bold in text mode." + + "<tt>This is text in <tt>, looks like bold text in text mode.</tt>" + "The product name is automatically replaced by the UI. " + "Use the special macro &product; for that." - + "" - + "The current product name is &product;." + "" + + "The current product name is &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] r67439 - in /trunk/s390/src: clients/dasd_auto.ycp modules/DASDController.ycp
by aschnell＠svn2.opensuse.org 15 Feb '12

15 Feb '12

Author: aschnell Date: Wed Feb 15 12:42:36 2012 New Revision: 67439 URL: http://svn.opensuse.org/viewcvs/yast?rev=67439&view=rev Log: - improved DASDController::modified handling - use switch statement Modified: trunk/s390/src/clients/dasd_auto.ycp trunk/s390/src/modules/DASDController.ycp Modified: trunk/s390/src/clients/dasd_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/clients/dasd_auto.ycp?r… ============================================================================== --- trunk/s390/src/clients/dasd_auto.ycp (original) +++ trunk/s390/src/clients/dasd_auto.ycp Wed Feb 15 12:42:36 2012 @@ -10,17 +10,7 @@ * goes through the configuration and return the setting. * Does not do any changes to the configuration. */ - -/** - * @param function to execute - * @param map/list of controller settings - * @return map edited settings, Summary or boolean on success depending on called function - * @example map mm = $[ "FAIL_DELAY" : "77" ]; - * @example map ret = WFM::CallFunction ("controller_auto", [ "Summary", mm ]); - */ - { - textdomain "s390"; y2milestone("----------------------------------------"); @@ -43,60 +33,88 @@ y2debug("func=%1", func); y2debug("param=%1", param); -/* Create a summary*/ -if(func == "Summary") { - ret = HTML::List(DASDController::Summary()); -} -/* Reset configuration */ -else if (func == "Reset") { - DASDController::Import($[]); - ret = $[]; -} -/* Change configuration (run AutoSequence) */ -else if (func == "Change") { - ret = DASDAutoSequence(); -} -/* Import configuration */ -else if (func == "Import") { - ret = DASDController::Import(param); -} -/* Return actual state */ -else if (func == "Export") { - ret = DASDController::Export(); -} -/* did configuration change */ -else if (func == "GetModified") { - ret = DASDController::modified; -} -/* set configuration as changed */ -else if (func == "SetModified") { - DASDController::modified = true; - ret = true; -} -/* Return needed packages */ -else if (func == "Packages") { - ret = DASDController::AutoPackages(); -} -/* Read current state */ -else if (func == "Read") { - import "Progress"; - Progress::off(); - ret = DASDController::Read(); - Progress::on(); -} -/* Write given settings */ -else if (func == "Write") { - import "Progress"; - Progress::off(); - DASDController::write_only = true; - ret = DASDController::Write(); - Progress::on(); -} -/* Unknown function */ -else { - y2error("Unknown function: %1", func); - ret = false; -} + switch (func) + { + case "Summary": // Create a summary + { + ret = HTML::List(DASDController::Summary()); + break; + } + + case "Reset": // Reset configuration + { + DASDController::Import($[]); + DASDController::SetModified(true); + ret = $[]; + break; + } + + case "Change": // Change configuration + { + ret = DASDAutoSequence(); + DASDController::SetModified(true); + break; + } + + case "Import": // Import configuration + { + ret = DASDController::Import(param); + DASDController::SetModified(true); + break; + } + + case "Export": // Return actual state + { + ret = DASDController::Export(); + DASDController::SetModified(false); + break; + } + + case "GetModified": // Did configuration change + { + ret = DASDController::GetModified(); + break; + } + + case "SetModified": // Set configuration as changed + { + DASDController::SetModified(true); + ret = true; + break; + } + + case "Packages": // Return needed packages + { + ret = DASDController::AutoPackages(); + break; + } + + case "Read": // Read current state + { + import "Progress"; + Progress::off(); + ret = DASDController::Read(); + Progress::on(); + DASDController::SetModified(true); + break; + } + + case "Write": // Write given settings + { + import "Progress"; + Progress::off(); + ret = DASDController::Write(); + Progress::on(); + break; + } + + default: // Unknown function + { + y2error("Unknown function: %1", func); + ret = false; + break; + } + } y2debug("ret=%1", ret); y2milestone("DASD auto finished"); @@ -104,5 +122,4 @@ return ret; -/* EOF */ } 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 12:42:36 2012 @@ -44,20 +44,17 @@ */ global boolean Modified(); + /** * Data was modified? */ -global boolean modified = true; // TODO +boolean modified = false; + /** */ global boolean proposal_valid = false; -/** - * Write only, used during autoinstallation. - * Don't run services and SuSEconfig, it's all done at one place. - */ -global boolean write_only = false; /** * Abort function @@ -80,11 +77,18 @@ * Data was modified? * @return true if modified */ -global boolean Modified() { - y2debug("modified=%1",modified); +global boolean GetModified() +{ return modified; } + +global void SetModified(boolean value) +{ + modified = value; +} + + /** * Is this kind of disk controller available? * @return boolean true if it is @@ -113,11 +117,14 @@ { ProbeDisks(); - devices = mapmap(integer index, map<string, any> d, devices, { + if (Mode::config()) + { + devices = mapmap(integer index, map<string, any> d, devices, { d["format"] = d["format"]:false; d["diag"] = d["diag"]:false; return $[ index : d ]; - }); + }); + } disk_configured = false; return true; @@ -130,6 +137,8 @@ */ global boolean Write() { + if (Mode::config()) + { list<string> to_format = []; foreach(integer index, map<string, any> device, devices, { @@ -150,6 +159,7 @@ if (!isempty(to_format)) FormatDisks(to_format, 8, true, true); + } if (disk_configured && Mode::normal ()) { -- 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] r67438 - in /trunk/wagon: package/yast2-wagon.changes src/modules/Wagon.ycp
by lslezak＠svn2.opensuse.org 15 Feb '12

15 Feb '12

Author: lslezak Date: Wed Feb 15 12:41:24 2012 New Revision: 67438 URL: http://svn.opensuse.org/viewcvs/yast?rev=67438&view=rev Log: - Automatically save solver test case in the migration proposal dialog for easy debugging (saved to /var/log/YaST2/wagon_test_case directory) (bnc#746313) Modified: trunk/wagon/package/yast2-wagon.changes trunk/wagon/src/modules/Wagon.ycp Modified: trunk/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/package/yast2-wagon.change… ============================================================================== --- trunk/wagon/package/yast2-wagon.changes (original) +++ trunk/wagon/package/yast2-wagon.changes Wed Feb 15 12:41:24 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Feb 15 10:33:50 UTC 2012 - lslezak(a)suse.cz + +- Automatically save solver test case in the migration proposal + dialog for easy debugging (saved to /var/log/YaST2/wagon_test_case + directory) (bnc#746313) + +------------------------------------------------------------------- Mon Jan 30 15:19:15 UTC 2012 - lslezak(a)suse.cz - do full migration only from SP2 repos (but also install patches Modified: trunk/wagon/src/modules/Wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/modules/Wagon.ycp?rev=… ============================================================================== --- trunk/wagon/src/modules/Wagon.ycp (original) +++ trunk/wagon/src/modules/Wagon.ycp Wed Feb 15 12:41:24 2012 @@ -488,6 +488,8 @@ Update::solve_errors = Pkg::PkgSolve(true) ? 0 : Pkg::PkgSolveErrors(); } + Pkg::CreateSolverTestCase("/var/log/YaST2/wagon_test_case"); + already_proposed = true; return true; -- 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] r67437 - in /trunk/wagon: package/yast2-wagon.changes src/clients/wagon_dup_repositories.ycp src/modules/Wagon.ycp
by lslezak＠svn2.opensuse.org 15 Feb '12

15 Feb '12

Author: lslezak Date: Wed Feb 15 12:40:32 2012 New Revision: 67437 URL: http://svn.opensuse.org/viewcvs/yast?rev=67437&view=rev Log: - do full migration only from SP2 repos (but also install patches in addition to minimal migration) (fate#311994) Modified: trunk/wagon/package/yast2-wagon.changes trunk/wagon/src/clients/wagon_dup_repositories.ycp trunk/wagon/src/modules/Wagon.ycp Modified: trunk/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/package/yast2-wagon.change… ============================================================================== --- trunk/wagon/package/yast2-wagon.changes (original) +++ trunk/wagon/package/yast2-wagon.changes Wed Feb 15 12:40:32 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jan 30 15:19:15 UTC 2012 - lslezak(a)suse.cz + +- do full migration only from SP2 repos (but also install patches + in addition to minimal migration) (fate#311994) + +------------------------------------------------------------------- Tue Jan 17 14:02:21 UTC 2012 - lslezak(a)suse.cz - ask user to confirm new licenses at upgrade proposal (bnc#741174) Modified: trunk/wagon/src/clients/wagon_dup_repositories.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/clients/wagon_dup_repo… ============================================================================== --- trunk/wagon/src/clients/wagon_dup_repositories.ycp (original) +++ trunk/wagon/src/clients/wagon_dup_repositories.ycp Wed Feb 15 12:40:32 2012 @@ -156,7 +156,7 @@ // heading text string heading_text = _("Migration Type"); // full migration? - boolean full = sort(Wagon::DupRepos()) == sort(Pkg::SourceGetCurrent(true)); + boolean full = Wagon::MigrationType() == `full; term contents = `VBox( // frame label @@ -168,7 +168,7 @@ // radio button `Left(`RadioButton(`id(`minimal), _("&Minimal - upgrade from repositories added by registration"), !full)), // radio button - `Left(`RadioButton(`id(`full), _("&Full - upgrade from all repositories"), full)) + `Left(`RadioButton(`id(`full), _("&Full - install also available patches in addition to Minimal migration"), full)) ) ) ) @@ -200,6 +200,7 @@ list<integer> prev_dup_repos = Wagon::DupRepos(); boolean prev_manual_selection = Wagon::ManualRepoSelection(); + symbol prev_migration_type = Wagon::MigrationType(); while (true) { // go to advanced config it was used previously @@ -211,17 +212,9 @@ symbol mtype = (symbol) UI::QueryWidget(`id(`migration_type), `CurrentButton); y2milestone("Selected migration type: %1", mtype); - if (mtype == `full) + if (mtype == `full || mtype == `minimal) { - // DUP: all repositories - y2milestone("Selected full migration, using %1 repositories", size(Pkg::SourceGetCurrent(true))); - Wagon::SetDupRepos(Pkg::SourceGetCurrent(true)); - Wagon::SetManualRepoSelection(false); - } - else if (mtype == `minimal) - { - // DUP: only added repositories - y2milestone("Selected minimal migration, using these repositories: %1", Wagon::RegistrationRepos()); + y2milestone("Selected minimal or full migration, using these repositories: %1", Wagon::RegistrationRepos()); map<string, integer> alias_to_id = $[]; foreach(integer repo, Pkg::SourceGetCurrent(true), @@ -240,6 +233,7 @@ Wagon::SetDupRepos(added_repos); Wagon::SetManualRepoSelection(false); + Wagon::SetMigrationType(mtype); } else { @@ -273,6 +267,7 @@ else if (ret == `next) { Wagon::SetManualRepoSelection(true); + Wagon::SetMigrationType(`custom); break; } else if (ret == `back) @@ -292,7 +287,7 @@ } } - if (ret == `next && (prev_dup_repos != Wagon::DupRepos() || prev_manual_selection != Wagon::ManualRepoSelection())) + if (ret == `next && (prev_dup_repos != Wagon::DupRepos() || prev_manual_selection != Wagon::ManualRepoSelection() || prev_migration_type != Wagon::MigrationType())) { y2milestone("DUP repository config has been changed, repropose package selection"); Wagon::ResetDUPProposal(); Modified: trunk/wagon/src/modules/Wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/modules/Wagon.ycp?rev=… ============================================================================== --- trunk/wagon/src/modules/Wagon.ycp (original) +++ trunk/wagon/src/modules/Wagon.ycp Wed Feb 15 12:40:32 2012 @@ -154,6 +154,34 @@ new_registration_repos = repos; } + // migration type, one of `minimal, `full, `custom + symbol migration_type = `minimal; + + // get the current migration type + global symbol MigrationType() + { + return migration_type; + } + + // set the migration type + // @param type Type of migration (`minimal, `full, `custom) + // @return boolean true on success + global boolean SetMigrationType(symbol type) + { + if (contains([`minimal, `full, `custom], type)) + { + migration_type = type; + y2milestone("Setting migration type: %1", type); + return true; + } + else + { + y2error("Invalid migration type: %1", type); + y2warning("Keeping the current type: %1", migration_type); + return false; + } + } + void ResetWorkflowSteps () { ProductControl::UnDisableAllModulesAndProposals (Mode::mode(), Stage::stage()); } @@ -430,65 +458,25 @@ list<integer> repos = Pkg::GetUpgradeRepos(); foreach(integer repo, repos, {Pkg::RemoveUpgradeRepo(repo);}); - // all repositories selected for upgrade? - if (sort(Pkg::SourceGetCurrent(true)) == sort(dup_repos)) - { - // reset solver flags (needed when switching from full DUP to partial DUP - Pkg::SetSolverFlags($["reset" : true]); + // reset solver flags + Pkg::SetSolverFlags($["reset" : true]); - y2milestone("Migration products: %1", migration_products); + // add upgrade repositories + y2milestone("Adding upgrade repos: %1", dup_repos); + foreach(integer repo, dup_repos, {Pkg::AddUpgradeRepo(repo);}); - list<string> product_names = maplist(map prod, Pkg::ResolvableProperties ("", `product, ""), {return prod["name"]:"";}); - // remove duplicates - product_names = toset(product_names); - - foreach(string prod_name, product_names, - { - list<map> products_named = Pkg::ResolvableProperties(prod_name, `product, ""); - y2milestone("Product: %1, resolvables: %2", prod_name, size(products_named)); - - if (size(products_named) > 1) - { - boolean installed = find(map p, products_named, {return p["status"]:`unknown == `installed;}) != nil; - boolean selected = find(map p, products_named, {return p["status"]:`unknown == `selected;}) != nil; - boolean removed = find(map p, products_named, {return p["status"]:`unknown == `removed;}) != nil; - boolean available = find(map p, products_named, {return p["status"]:`unknown == `available;}) != nil; - - y2milestone("Product: %1, installed: %2, selected: %3, removed: %4, available: %5", prod_name, installed, selected, removed, available); - - // force upgrade of installed non-migration products - if (installed && !selected && !removed && available && !contains(migration_products, prod_name)) - { - y2milestone("Found installed product: %1, forcing product upgrade", prod_name); - Pkg::ResolvableInstall(prod_name, `product); - } - } - }); + // be compatible with "zypper dup --from" + Pkg::SetSolverFlags($["ignoreAlreadyRecommended" : true]); - foreach(string prod, migration_products, { - y2milestone("Removing migration product: %1", prod); - Pkg::ResolvableRemove(prod, `product); - }); - - // do full distribution upgrade - map <string, any> update_conf = GetUpdateConf(); - map <symbol, integer> update_sum = Pkg::PkgUpdateAll (update_conf); - y2milestone ("Update configuration: %1, update summary: %2", update_conf, update_sum); + if (MigrationType() == `full) + { + // run the solver to evaluate applicable patches + Pkg::PkgSolve(false); - // also preselect all applicable patches (except optional ones) + // preselect all applicable patches (except optional ones) integer patches = Pkg::ResolvablePreselectPatches(`all); y2milestone("Preselected patches: %1", patches); } - else - { - // do partial DUP - // add upgrade repositories - y2milestone("Adding upgrade repos: %1", dup_repos); - foreach(integer repo, dup_repos, {Pkg::AddUpgradeRepo(repo);}); - - // be compatible with "zypper dup --from" - Pkg::SetSolverFlags($["ignoreAlreadyRecommended" : true]); - } // set the solve error flag for packages proposal Update::solve_errors = Pkg::PkgSolve(true) ? 0 : Pkg::PkgSolveErrors(); -- 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] r67436 - in /branches/SuSE-Code-11-SP2-Branch/wagon: package/yast2-wagon.changes src/modules/Wagon.ycp
by lslezak＠svn2.opensuse.org 15 Feb '12

15 Feb '12

Author: lslezak Date: Wed Feb 15 12:38:12 2012 New Revision: 67436 URL: http://svn.opensuse.org/viewcvs/yast?rev=67436&view=rev Log: - Automatically save solver test case in the migration proposal dialog for easy debugging (saved to /var/log/YaST2/wagon_test_case directory) (bnc#746313) Modified: branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes branches/SuSE-Code-11-SP2-Branch/wagon/src/modules/Wagon.ycp Modified: branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/package/yast2-wagon.changes Wed Feb 15 12:38:12 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Feb 15 10:33:50 UTC 2012 - lslezak(a)suse.cz + +- Automatically save solver test case in the migration proposal + dialog for easy debugging (saved to /var/log/YaST2/wagon_test_case + directory) (bnc#746313) + +------------------------------------------------------------------- Mon Jan 30 15:19:15 UTC 2012 - lslezak(a)suse.cz - do full migration only from SP2 repos (but also install patches Modified: branches/SuSE-Code-11-SP2-Branch/wagon/src/modules/Wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/wagon/src/modules/Wagon.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/wagon/src/modules/Wagon.ycp Wed Feb 15 12:38:12 2012 @@ -487,6 +487,8 @@ Update::solve_errors = Pkg::PkgSolve(true) ? 0 : Pkg::PkgSolveErrors(); } + Pkg::CreateSolverTestCase("/var/log/YaST2/wagon_test_case"); + already_proposed = true; return true; -- 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] r67435 - in /branches/SuSE-Code-11-SP1-Branch/wagon: VERSION package/yast2-wagon.changes src/modules/Wagon.ycp
by lslezak＠svn2.opensuse.org 15 Feb '12

15 Feb '12

Author: lslezak Date: Wed Feb 15 12:31:05 2012 New Revision: 67435 URL: http://svn.opensuse.org/viewcvs/yast?rev=67435&view=rev Log: - Automatically save solver test case in the migration proposal dialog for easy debugging (saved to /var/log/YaST2/wagon_test_case directory) (bnc#746313) - 2.17.17.9 Modified: branches/SuSE-Code-11-SP1-Branch/wagon/VERSION branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/Wagon.ycp Modified: branches/SuSE-Code-11-SP1-Branch/wagon/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/VERSION Wed Feb 15 12:31:05 2012 @@ -1 +1 @@ -2.17.17.8 +2.17.17.9 Modified: branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes Wed Feb 15 12:31:05 2012 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Wed Feb 15 10:33:50 UTC 2012 - lslezak(a)suse.cz + +- Automatically save solver test case in the migration proposal + dialog for easy debugging (saved to /var/log/YaST2/wagon_test_case + directory) (bnc#746313) +- 2.17.17.9 + +------------------------------------------------------------------- Mon Jan 30 15:19:15 UTC 2012 - lslezak(a)suse.cz - do full migration only from SP2 repos (but also install patches Modified: branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/Wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/Wagon.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/Wagon.ycp Wed Feb 15 12:31:05 2012 @@ -487,6 +487,8 @@ Update::solve_errors = Pkg::PkgSolve(true) ? 0 : Pkg::PkgSolveErrors(); } + Pkg::CreateSolverTestCase("/var/log/YaST2/wagon_test_case"); + already_proposed = true; return true; -- 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] r67434 - in /trunk/s390/src/dasd: dialogs.ycp wizards.ycp
by aschnell＠svn2.opensuse.org 15 Feb '12

15 Feb '12

Author: aschnell Date: Wed Feb 15 12:15:43 2012 New Revision: 67434 URL: http://svn.opensuse.org/viewcvs/yast?rev=67434&view=rev Log: - implemented deleting of dasds in autoyast editor Modified: trunk/s390/src/dasd/dialogs.ycp trunk/s390/src/dasd/wizards.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 12:15:43 2012 @@ -234,11 +234,11 @@ { DisplayDASDDialog (); ReloadDASDDialog (); - any ret = nil; + symbol ret = nil; while (ret == nil) { - ret = UI::UserInput(); + ret = (symbol) UI::UserInput(); if (ret == `filter) { @@ -395,7 +395,7 @@ `PushButton (`id (`cancel), Label::CancelButton ()) ) )); - ret = UI::UserInput (); + ret = (symbol) UI::UserInput(); par = (integer) UI::QueryWidget(`id(`par), `Value); boolean write_vl = (boolean) UI::QueryWidget(`id(`write_label), `Value); UI::CloseDialog (); @@ -441,7 +441,7 @@ ret = nil; } } - return (symbol)ret; + return ret; } @@ -449,11 +449,11 @@ * Run the dialog for adding DASDs * @return symbol from AddDASDDiskDialog */ -symbol AddDASDDiskDialog () +symbol AddDASDDiskDialog() { - if (! Mode::config ()) + if (!Mode::config()) { - y2error ("DASD Add Disk dialog shouldn't be run in Mode::config ()"); + y2error("DASD Add Disk dialog shouldn't be run in Mode::config()"); return `back; } @@ -484,11 +484,12 @@ Wizard::RestoreBackButton (); Wizard::RestoreAbortButton (); - any ret = nil; + UI::ChangeWidget(`id(`channel), `ValidChars, "0123456789abcdefABCDEF."); + symbol ret = nil; while (ret == nil) { - ret = UI::UserInput(); + ret = (symbol) UI::UserInput(); if (ret == `abort || ret == `cancel) { @@ -522,7 +523,29 @@ DASDController::devices[index] = m; } - return (symbol) ret; + return ret; +} + + +/** + * Run the dialog for deleting DASDs + * @return symbol from DeleteDASDDiskDialog + */ +symbol DeleteDASDDiskDialog() +{ + if (!Mode::config()) + { + y2error("DASD Delete Disk dialog shouldn't be run in Mode::config()"); + return `back; + } + + list<integer> selected = ListSelectedDASD(); + + DASDController::devices = filter(integer index, map<string, any> d, DASDController::devices, { + return !contains(selected, index); + }); + + return `next; } } Modified: trunk/s390/src/dasd/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/dasd/wizards.ycp?rev=67… ============================================================================== --- trunk/s390/src/dasd/wizards.ycp (original) +++ trunk/s390/src/dasd/wizards.ycp Wed Feb 15 12:15:43 2012 @@ -23,7 +23,8 @@ { map aliases = $[ "main" : ``(DASDDialog()), - "add" : ``(AddDASDDiskDialog()) + "add" : ``(AddDASDDiskDialog()), + "delete" : ``(DeleteDASDDiskDialog()) ]; map sequence = $[ @@ -32,10 +33,15 @@ `abort : `abort, `next : `next, `add : "add", + `delete : "delete" ], "add" : $[ `abort : `abort, - `next : "main", + `next : "main" + ], + "delete" : $[ + `abort : `abort, + `next : "main" ], ]; @@ -50,9 +56,9 @@ any DASDSequence() { map aliases = $[ - "read" : [ ``( ReadDialog() ), true ], - "main" : ``( MainDASDSequence() ), - "write" : [ ``( WriteDialog() ), true ] + "read" : [ ``(ReadDialog()), true ], + "main" : ``(MainDASDSequence()), + "write" : [ ``(WriteDialog()), true ] ]; map sequence = $[ -- 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] r67433 - /tags/stable-2_22_4/installation/
by gs＠svn2.opensuse.org 15 Feb '12

15 Feb '12

Author: gs Date: Wed Feb 15 11:50:19 2012 New Revision: 67433 URL: http://svn.opensuse.org/viewcvs/yast?rev=67433&view=rev Log: Created tag stable-2_22_4 for installation Added: tags/stable-2_22_4/installation/ - copied from r67432, 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] r67432 - in /trunk/installation: VERSION package/yast2-installation.changes
by gs＠svn2.opensuse.org 15 Feb '12

15 Feb '12

Author: gs Date: Wed Feb 15 11:48:38 2012 New Revision: 67432 URL: http://svn.opensuse.org/viewcvs/yast?rev=67432&view=rev Log: 2.22.4 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=67432&r… ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Wed Feb 15 11:48:38 2012 @@ -1 +1 @@ -2.22.3 +2.22.4 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 Wed Feb 15 11:48:38 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Feb 15 11:46:45 CET 2012 - gs(a)suse.de + +- Improve layout of the release notes dialog (bnc #550610) +- 2.22.4 + +------------------------------------------------------------------- Thu Feb 9 10:53:01 CET 2012 - jsuchome(a)suse.cz - adapt the style only for ssh installation, not vnc (bnc#742777) -- 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] r67431 - in /trunk/s390: package/yast2-s390.changes src/dasd/dialogs.ycp src/modules/DASDController.ycp
by aschnell＠svn2.opensuse.org 15 Feb '12

15 Feb '12

Author: aschnell Date: Wed Feb 15 11:46:23 2012 New Revision: 67431 URL: http://svn.opensuse.org/viewcvs/yast?rev=67431&view=rev Log: - make DASD module work for autoyast editor Modified: trunk/s390/package/yast2-s390.changes trunk/s390/src/dasd/dialogs.ycp trunk/s390/src/modules/DASDController.ycp Modified: trunk/s390/package/yast2-s390.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/package/yast2-s390.changes?… ============================================================================== --- trunk/s390/package/yast2-s390.changes (original) +++ trunk/s390/package/yast2-s390.changes Wed Feb 15 11:46:23 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Feb 15 11:25:49 CET 2012 - aschnell(a)suse.de + +- make DASD module work for autoyast editor + +------------------------------------------------------------------- Fri Feb 10 14:59:45 CET 2012 - aschnell(a)suse.de - used multiselection table in main DASD dialog 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 11:46:23 2012 @@ -72,7 +72,7 @@ if (Mode::config ()) { items = maplist (integer k, map<string,any> d, devices, { - string channel = d["channel_id"]:""; + string channel = d["channel"]:""; string diag = String::YesNo(d["diag"]:false); string format = String::YesNo(d["format"]:false); return `item(`id(k), channel, format, diag); @@ -217,8 +217,6 @@ DASDController::filter_min = (string) UI::QueryWidget(`min_chan, `Value); DASDController::filter_max = (string) UI::QueryWidget(`max_chan, `Value); - DASDController::ProbeDisks(); - list<term> items = GetDASDDiskItems(); list<integer> selected = (list<integer>) UI::QueryWidget(`id(`table), `SelectedItems); @@ -242,7 +240,8 @@ { ret = UI::UserInput(); - if (ret == `filter) { + if (ret == `filter) + { ReloadDASDDialog (); ret = nil; continue; @@ -269,6 +268,8 @@ DASDController::ActivateDisk(channel, diag); }); + DASDController::ProbeDisks(); + ReloadDASDDialog (); ret = nil; } @@ -289,6 +290,8 @@ DASDController::DeactivateDisk(channel, diag); }); + DASDController::ProbeDisks(); + ReloadDASDDialog (); ret = nil; } @@ -311,6 +314,8 @@ DASDController::ActivateDisk(channel, true); }); + DASDController::ProbeDisks(); + ReloadDASDDialog (); ret = nil; } @@ -333,6 +338,8 @@ DASDController::ActivateDisk(channel, false); }); + DASDController::ProbeDisks(); + ReloadDASDDialog (); ret = nil; } @@ -428,6 +435,7 @@ return DASDController::devices[id, "dev_name"]:""; }); DASDController::FormatDisks (devices, par, write_vl, true); + DASDController::ProbeDisks(); ReloadDASDDialog (); UI::SetFocus (`table); ret = nil; @@ -436,6 +444,7 @@ return (symbol)ret; } + /** * Run the dialog for adding DASDs * @return symbol from AddDASDDiskDialog @@ -489,19 +498,24 @@ { ret = nil; } + } + else if (ret == `next) + { + // TODO check for duplicate channel } } if (ret == `next) { - string channel = (string)UI::QueryWidget (`id (`channel), `Value); - boolean format = (boolean)UI::QueryWidget (`id (`format), `Value); - boolean diag = (boolean)UI::QueryWidget (`id (`diag), `Value); + 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 = $[ - "channel_id" : channel, + "channel" : channel, "format" : format, "diag" : diag, ]; + integer index = 0; while (haskey (DASDController::devices, index)) index = index + 1; 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 11:46:23 2012 @@ -14,15 +14,13 @@ textdomain "s390"; import "Mode"; -import "Progress"; import "Report"; -import "Stage"; -import "Summary"; import "Arch"; import "FileUtils"; import "Popup"; import "String"; + global map<integer,map<string,any> > devices = $[]; global string filter_min = "0.0.0000"; @@ -49,7 +47,7 @@ /** * Data was modified? */ -global boolean modified = false; +global boolean modified = true; // TODO /** */ @@ -95,21 +93,64 @@ return true; } + + string GetDeviceName(string channel) + { + 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 && !isempty(disk["stdout"]:"")) + return sformat("/dev/%1", disk["stdout"]:""); + + return nil; + } + + /** * Read all controller settings * @return true on success */ -global boolean Read() { +global boolean Read() +{ + ProbeDisks(); + + devices = mapmap(integer index, map<string, any> d, devices, { + d["format"] = d["format"]:false; + d["diag"] = d["diag"]:false; + return $[ index : d ]; + }); + disk_configured = false; return true; - } + /** * Write all controller settings * @return true on success */ -global boolean Write() { +global boolean Write() +{ + 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); + + 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); + + if (!isempty(to_format)) + FormatDisks(to_format, 8, true, true); + if (disk_configured && Mode::normal ()) { string command = "/sbin/mkinitrd && /sbin/zipl"; @@ -121,6 +162,7 @@ { y2milestone ("No new disk configured"); } + return true; } @@ -130,50 +172,19 @@ * @param settings The YCP structure to be imported. * @return boolean True on success */ -global boolean Import (map settings) { - if (Mode::config ()) - { +global boolean Import(map settings) +{ integer index = -1; - devices = listmap (map<string,any> d, settings["devices"]:[], { - index = index + 1; - return $[ index : d ]; - }); - } - else if (Stage::initial ()) - { - // activate all disks first - map<string,boolean> to_format = $[]; - foreach (map d, settings["devices"]:[], { - boolean format = d["format"]:false; - boolean do_diag = d["diag"]:false; - string channel = d["channel"]:""; - if (channel != "") - { - to_format[channel] = format; - ActivateDisk (channel, do_diag); - } - }); + devices = listmap (map<string, any> d, settings["devices"]:[], { + index = index + 1; - // now probe all disks to get the mapping between channel and device - ProbeDisks (); + d = filter(string k, any v, d, { + return contains([ "channel", "format", "diag" ], k); + }); - // now map the channels of the disks to format to devices - list<string> format_list = []; - foreach (integer i, map<string,any> d, devices, { - string channel = d["channel"]:""; - string device = d["dev_name"]:""; - if (channel != "" && device != "") - { - if (to_format[channel]:false) - format_list = add (format_list, device); - } + return $[ index : d ]; }); - y2milestone ("Disks to format: %1", format_list); - // now format the disks - if (size (format_list) > 0) - FormatDisks (format_list, 8, true, true); - } return true; } @@ -185,44 +196,16 @@ */ global map<string, list> Export() { - ProbeDisks(); - - if (Mode::config()) - { list<map<string, any> > l = maplist(integer i, map<string, any> d, devices, { - // if possible, use device by-path (bnc#591603) - string tmp = find(string s, d["dev_names"]:[], { - return String::StartsWith(s, "/dev/disk/by-path/"); - }); - if (tmp != nil) - d["dev_name"] = tmp; - return d; - }); - - l = filter(map<string, any> m, l, { - return m["resource", "io", 0, "active"]:false; - }); - /* - l = maplist(map<string, any> m, l, { - return filter(string k, any v, m, { - return contains([ "channel", "dev_name" ], k); + d = filter(string k, any v, d, { + return contains([ "channel", "format", "diag" ], k); }); - }); - */ - return $[ "devices" : l ]; - } - else - { - list<map<string, any> > l = maplist (integer i, map<string, any> d, devices, { - return $[ "channel" : d["channel"]:"", - "format" : false, - "diag" : false ]; - }); + return d; + }); return $[ "devices" : l ]; - } } @@ -276,25 +259,24 @@ global list<string> Summary() { list<string> ret = maplist (integer index, map<string,any> d, devices, { - string s = ""; // summary text, %1 is channel ID (number), // %2 and %3 are Yes or No - s = sformat (_("Channel ID: %1, Format: %2, Use DIAG: %3"), - d["channel"]:"", String::YesNo(d["format"]:false), String::YesNo(d["diag"]:false) - ); - return s; + return sformat(_("Channel: %1, Format: %2, Use DIAG: %3"), d["channel"]:"", + String::YesNo(d["format"]:false), String::YesNo(d["diag"]:false)); }); y2milestone ("Summary: %1", ret); return ret; } + /** * Return packages needed to be installed and removed during * Autoinstallation to insure module has all needed software * installed. * @return map with 2 lists. */ -global map AutoPackages() { +global map AutoPackages() +{ return $[ "install":[], "remove":[] ]; } @@ -320,18 +302,16 @@ */ global void ProbeDisks() { -/* if (Mode::config ()) - return; */ - // popup label UI::OpenDialog (`Label (_("Reading Configured DASD Disks"))); list<map<string, any> > disks = (list<map<string, any> >) SCR::Read(.probe.disk); disks = filter (map<string, any> d, disks, { return tolower(d["device"]:"") == "dasd"; }); - + disks = maplist (map<string,any> d, disks, { string channel = d["sysfs_bus_id"]:"0.0.0000"; d["channel"] = channel; + boolean active = d["resource", "io", 0, "active"]:false; if (active) { @@ -346,56 +326,29 @@ } d["formatted"] = formatted; d["partition_info"] = GetPartitionInfo (device); - } - string diag_file = sformat("/sys/%1/device/use_diag", d["sysfs_id"]:""); - if (FileUtils::Exists(diag_file)) - { - string use_diag = (string)SCR::Read(.target.string, diag_file); - diag[channel] = substring(use_diag, 0, 1) == "1"; + string diag_file = sformat("/sys/%1/device/use_diag", d["sysfs_id"]:""); + if (FileUtils::Exists(diag_file)) + { + string use_diag = (string) SCR::Read(.target.string, diag_file); + d["diag"] = substring(use_diag, 0, 1) == "1"; + diag[channel] = substring(use_diag, 0, 1) == "1"; + } } + d = filter(string k, any v, d, { return contains([ "channel", "diag", + "resource", "formatted", "partition_info", "dev_name", "detail", + "device_id", "sub_device_id" ], k); }); + return d; }); + integer index = -1; - DASDController::devices = listmap (map<string,any> d, disks, { + devices = listmap (map<string, any> d, disks, { index = index + 1; return $[ index : d ]; }); -/* -DASDController::devices = (map<integer,map<string,any> >) - SCR::Read (.target.ycp, "/root/dasddevices.ycp"); -$[ -0:$[ -"bus":"None", -"bus_hwcfg":"none", -"channel":"0.0.0150", -"class_id":262, -"detail":$["cu_model":233, "dev_model":10, "lcss":0], -"dev_name":"/dev/dasda", -"dev_names":["/dev/dasda"], -"dev_num":$["major":94, "minor":0, "range":4, "type":"b"], -"device":"DASD", -"device_id":276880, -"driver":"io_subchannel", -"drivers":[$["active":true, "modprobe":true, "modules":[["dasd_eckd_mod", ""]]]], -"formatted":true, -"model":"IBM DASD", -"old_unique_key":"N5EP.J4gQoPlOYuE", -"partition_info":"--", -"prog_if":1, -"resource":$["disk_log_geo":[$["cylinders":3339, "heads":15, "sectors":12]], "io":[$["active":true, "length":1, "mode":"rw", "start":336]], "size":[$["unit":"sectors", "x":601020, "y":4096]]], -"sub_class_id":0, -"sub_device_id":275344, -"sysfs_bus_id":"0.0.0150", -"unique_key":"kNlH.ALFATSt_U8F", -"vendor":"IBM", -"vendor_id":286721 -], -]; -*/ - UI::CloseDialog (); } -- 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] r67430 - /trunk/installation/src/clients/inst_release_notes.ycp
by gs＠svn2.opensuse.org 15 Feb '12

15 Feb '12

Author: gs Date: Wed Feb 15 11:46:23 2012 New Revision: 67430 URL: http://svn.opensuse.org/viewcvs/yast?rev=67430&view=rev Log: improve layout (use MarginBox), bnc #550610 Modified: trunk/installation/src/clients/inst_release_notes.ycp Modified: trunk/installation/src/clients/inst_release_notes.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_re… ============================================================================== --- trunk/installation/src/clients/inst_release_notes.ycp (original) +++ trunk/installation/src/clients/inst_release_notes.ycp Wed Feb 15 11:46:23 2012 @@ -192,23 +192,19 @@ string caption = _("Release Notes"); term relnoteslayout = nil; - term relnotesscreen = `VBox ( - `HBox( - `HWeight( 20, `Empty() ), - // combobox - `HWeight( 60, `VBox(`Left ( - `ReplacePoint ( - `id(`lang_rp), - `ComboBox (`id (`lang), `opt (`notify), _("&Language"), []) - ) - ), - `ReplacePoint(`id(`content_rp), - `RichText (`id (`relnotescontent), "") - ) - )), - `HWeight( 20,`Empty() ) - ) - ); + term relnotesscreen = `MarginBox ( 2.0, 0.2, + // combobox + `VBox(`Left ( + `ReplacePoint ( + `id(`lang_rp), + `ComboBox (`id (`lang), `opt (`notify), _("&Language"), []) + ) + ), + `ReplacePoint(`id(`content_rp), + `RichText (`id (`relnotescontent), "") + ) + ) + ); // if there are more products installed, show them in tabs or with // combo box, bnc #359137 (do not show tab for one product) @@ -268,7 +264,7 @@ boolean UsePlainText ( string file ) { boolean ret = UI::TextMode() && FileUtils::Exists(file); if (ret) - y2milestone("Found .txt file with release notes, will use it for TUI."); + y2milestone("Found .txt file \"%1\" with release notes, will use it for TUI.", file); return ret; } -- 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] r67429 - /tags/stable-2_22_0/iscsi-client/
by fehr＠svn2.opensuse.org 15 Feb '12

15 Feb '12

Author: fehr Date: Wed Feb 15 11:37:44 2012 New Revision: 67429 URL: http://svn.opensuse.org/viewcvs/yast?rev=67429&view=rev Log: Created tag stable-2_22_0 for iscsi-client Added: tags/stable-2_22_0/iscsi-client/ - copied from r67428, trunk/iscsi-client/ -- 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] r67428 - in /trunk/iscsi-client: VERSION package/yast2-iscsi-client.changes
by fehr＠svn2.opensuse.org 15 Feb '12

15 Feb '12

Author: fehr Date: Wed Feb 15 11:36:25 2012 New Revision: 67428 URL: http://svn.opensuse.org/viewcvs/yast?rev=67428&view=rev Log: version 2.22.0 Modified: trunk/iscsi-client/VERSION trunk/iscsi-client/package/yast2-iscsi-client.changes Modified: trunk/iscsi-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/VERSION?rev=67428&r… ============================================================================== --- trunk/iscsi-client/VERSION (original) +++ trunk/iscsi-client/VERSION Wed Feb 15 11:36:25 2012 @@ -1 +1 @@ -2.21.9 +2.22.0 Modified: trunk/iscsi-client/package/yast2-iscsi-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/package/yast2-iscsi… ============================================================================== --- trunk/iscsi-client/package/yast2-iscsi-client.changes (original) +++ trunk/iscsi-client/package/yast2-iscsi-client.changes Wed Feb 15 11:36:25 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Feb 15 11:36:05 CET 2012 - fehr(a)suse.de + +- version 2.22.0 + +------------------------------------------------------------------- Mon Feb 6 14:05:22 CET 2012 - fehr(a)suse.de - change detection of qla iscsi devices (bnc#745201) -- 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] r67427 - /trunk/s390/src/modules/DASDController.ycp
by aschnell＠svn2.opensuse.org 14 Feb '12

14 Feb '12

Author: aschnell Date: Tue Feb 14 20:46:03 2012 New Revision: 67427 URL: http://svn.opensuse.org/viewcvs/yast?rev=67427&view=rev Log: - fixed exit code check (missing from bnc #561876) 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 Tue Feb 14 20:46:03 2012 @@ -489,7 +489,8 @@ ); integer ret = (integer)SCR::Execute (.target.bash, command); y2milestone ("Running command %1 with exit code %2", command, ret); - if (ret == 5){ + if (ret == 8) + { string popup = sformat (_("Device %1 is not formatted. Format device now? If you want to format multiple devices in parallel, press 'Cancel' and select 'Perform Action', 'Format' later on. -- 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] r67426 - in /trunk/s390/src/modules: DASDController.ycp ZFCPController.ycp
by aschnell＠svn2.opensuse.org 14 Feb '12

14 Feb '12

Author: aschnell Date: Tue Feb 14 20:44:53 2012 New Revision: 67426 URL: http://svn.opensuse.org/viewcvs/yast?rev=67426&view=rev Log: - use switch statement Modified: trunk/s390/src/modules/DASDController.ycp trunk/s390/src/modules/ZFCPController.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 Tue Feb 14 20:44:53 2012 @@ -399,6 +399,7 @@ UI::CloseDialog (); } + /** * Report error occured during device activation * @param id integer chanel id of the device @@ -406,51 +407,72 @@ */ void ReportActivationError(any id, integer ret) { - if (ret != 0) + switch (ret) { - if (ret == 1) + case 0: + break; + + case 1: Report::Error (sformat ( // error report, %1 is device identification _("%1: sysfs not mounted."), id)); - else if (ret == 2) + break; + + case 2: Report::Error (sformat ( // error report, %1 is device identification _("%1: Invalid status for <online>."), id)); - else if (ret == 3) + break; + + case 3: Report::Error (sformat ( // error report, %1 is device identification _("%1: No device found for <ccwid>."), id)); - else if (ret == 4) + break; + + case 4: Report::Error (sformat ( // error report, %1 is device identification _("%1: Could not change state of the device."), id)); - else if (ret == 5) + break; + + case 5: // https://bugzilla.novell.com/show_bug.cgi?id=446998#c15 Report::Error (sformat ( // error report, %1 is device identification _("%1: Device is not a DASD."), id)); - else if (ret == 6) + break; + + case 6: // https://bugzilla.novell.com/show_bug.cgi?id=446998#c15 Report::Error (sformat ( // error report, %1 is device identification _("%1: Could not load module."), id)); - else if (ret == 7) - //bugzilla.novell.com/show_bug.cgi?id=561876#c8 + break; + + case 7: + // http://bugzilla.novell.com/show_bug.cgi?id=561876#c8 Report::Error (sformat ( // error report, %1 is device identification _("%1: Failed to activate DASD."), id)); - else if (ret == 8) - //bugzilla.novell.com/show_bug.cgi?id=561876#c8 + break; + + case 8: + // http://bugzilla.novell.com/show_bug.cgi?id=561876#c8 Report::Error (sformat ( // error report, %1 is device identification _("%1: DASD is not formatted."), id)); - else + break; + + default: Report::Error (sformat ( // error report, %1 is device identification, %2 is integer code _("%1: Unknown error %2."), id, ret)); + break; } } + /** * Activate selected Disks * @param channel string Name of the disk to activate Modified: trunk/s390/src/modules/ZFCPController.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/ZFCPController.… ============================================================================== --- trunk/s390/src/modules/ZFCPController.ycp (original) +++ trunk/s390/src/modules/ZFCPController.ycp Tue Feb 14 20:44:53 2012 @@ -328,6 +328,7 @@ UI::CloseDialog(); } + /** * Report error occured during device activation * @param id integer chanel id of the device @@ -335,51 +336,74 @@ */ void ReportActivationError(any id, integer ret) { - if (ret != 0) + switch (ret) { - if (ret == 1) + case 0: + break; + + case 1: Report::Error (sformat ( // error report, %1 is device identification _("%1: sysfs not mounted."), id)); - else if (ret == 2) + break; + + case 2: Report::Error (sformat ( // error report, %1 is device identification _("%1: Invalid status for <online>."), id)); - else if (ret == 3) + break; + + case 3: Report::Error (sformat ( // error report, %1 is device identification _("%1: No device found for <ccwid>."), id)); - else if (ret == 4) + break; + + case 4: Report::Error (sformat ( // error report, %1 is device identification _("%1: WWPN invalid."), id)); - else if (ret == 5) + break; + + case 5: Report::Error (sformat ( // error report, %1 is device identification _("%1: Could not activate WWPN for adapter %1."), id)); - else if (ret == 6) + break; + + case 6: Report::Error (sformat ( // error report, %1 is device identification _("%1: Could not activate ZFCP device."), id)); - else if (ret == 7) + break; + + case 7: Report::Error (sformat ( // error report, %1 is device identification _("%1: SCSI disk could not be deactivated."), id)); - else if (ret == 8) + break; + + case 8: Report::Error (sformat ( // error report, %1 is device identification _("%1: ZFCP LUN could not be unregistered."), id)); - else if (ret == 9) + break; + + case 9: Report::Error (sformat ( // error report, %1 is device identification _("%1: ZFCP WWPN could not be unregistered."), id)); - else + break; + + default: Report::Error (sformat ( // error report, %1 is device identification, %2 is integer code _("%1: Unknown error %2."), id, ret)); + break; } } + /** * Report error occured during device activation * @param id integer chanel id of the device @@ -387,39 +411,56 @@ */ void ReportControllerActivationError(any id, integer ret) { - if (ret != 0) + switch (ret) { - if (ret == 1) + case 0: + break; + + case 1: Report::Error (sformat ( // error report, %1 is device identification _("%1: sysfs not mounted."), id)); - else if (ret == 2) + break; + + case 2: Report::Error (sformat ( // error report, %1 is device identification _("%1: Invalid status for <online>."), id)); - else if (ret == 3) + break; + + case 3: Report::Error (sformat ( // error report, %1 is device identification _("%1: Device <ccwid> does not exist."), id)); - else if (ret == 4) + break; + + case 4: Report::Error (sformat ( // error report, %1 is device identification _("%1: Module zfcp could not be loaded."), id)); - else if (ret == 5) + break; + + case 5: Report::Error (sformat ( // error report, %1 is device identification _("%1: Adapter status could not be changed."), id)); - else if (ret == 6) + break; + + case 6: Report::Error (sformat ( // error report, %1 is device identification _("%1: WWPN ports still active."), id)); - else + break; + + default: Report::Error (sformat ( // error report, %1 is device identification, %2 is integer code _("%1: Unknown error %2."), id, ret)); + break; } } + /** * Activate a disk * @param channel string channel id -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0