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

[yast-commit] r67425 - in /trunk/s390/src: dasd/wizards.ycp zfcp/wizards.ycp
by aschnell＠svn2.opensuse.org 14 Feb '12

14 Feb '12

Author: aschnell Date: Tue Feb 14 11:41:44 2012 New Revision: 67425 URL: http://svn.opensuse.org/viewcvs/yast?rev=67425&view=rev Log: - use correct CloseDialog function Modified: trunk/s390/src/dasd/wizards.ycp trunk/s390/src/zfcp/wizards.ycp 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 Tue Feb 14 11:41:44 2012 @@ -6,9 +6,7 @@ * * $Id$ */ - { - textdomain "s390"; import "Sequencer"; @@ -16,14 +14,16 @@ include "s390/dasd/dialogs.ycp"; + /** * Whole configuration of controller * @return symbol MainDASDSequence */ -symbol MainDASDSequence () { +symbol MainDASDSequence() +{ map aliases = $[ - "main" : ``(DASDDialog ()), - "add" : ``(AddDASDDiskDialog ()) + "main" : ``(DASDDialog()), + "add" : ``(AddDASDDiskDialog()) ]; map sequence = $[ @@ -39,15 +39,16 @@ ], ]; - return Sequencer::Run (aliases, sequence); + return Sequencer::Run(aliases, sequence); } + /** * Whole configuration of controller * @return sequence result */ -any DASDSequence() { - +any DASDSequence() +{ map aliases = $[ "read" : [ ``( ReadDialog() ), true ], "main" : ``( MainDASDSequence() ), @@ -75,17 +76,19 @@ any ret = Sequencer::Run(aliases, sequence); - UI::CloseDialog(); + Wizard::CloseDialog(); + return ret; } + /** * Whole configuration of controller but without reading and writing. * For use with autoinstallation. * @return sequence result */ -any DASDAutoSequence() { - +any DASDAutoSequence() +{ /* Initialization dialog caption */ string caption = _("Controller Configuration"); /* Initialization dialog contents */ @@ -98,9 +101,9 @@ any ret = MainDASDSequence(); - UI::CloseDialog(); + Wizard::CloseDialog(); + return ret; } -/* EOF */ } Modified: trunk/s390/src/zfcp/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/zfcp/wizards.ycp?rev=67… ============================================================================== --- trunk/s390/src/zfcp/wizards.ycp (original) +++ trunk/s390/src/zfcp/wizards.ycp Tue Feb 14 11:41:44 2012 @@ -6,9 +6,7 @@ * * $Id$ */ - { - textdomain "s390"; import "Sequencer"; @@ -16,14 +14,16 @@ include "s390/zfcp/dialogs.ycp"; + /** * Main dialog * @return symbol dialog */ -symbol MainZFCPSequence () { +symbol MainZFCPSequence() +{ map aliases = $[ - "main" : ``(ZFCPDialog ()), - "add" : ``(AddZFCPDiskDialog ()) + "main" : ``(ZFCPDialog()), + "add" : ``(AddZFCPDiskDialog()) ]; map sequence = $[ @@ -39,15 +39,16 @@ ], ]; - return Sequencer::Run (aliases, sequence); + return Sequencer::Run(aliases, sequence); } + /** * Whole configuration of controller * @return sequence result */ -any ZFCPSequence() { - +any ZFCPSequence() +{ map aliases = $[ "read" : [ ``( ReadDialog() ), true ], "main" : ``( MainZFCPSequence() ), @@ -75,17 +76,19 @@ any ret = Sequencer::Run(aliases, sequence); - UI::CloseDialog(); + Wizard::CloseDialog(); + return ret; } + /** * Whole configuration of controller but without reading and writing. * For use with autoinstallation. * @return sequence result */ -any ZFCPAutoSequence() { - +any ZFCPAutoSequence() +{ /* Initialization dialog caption */ string caption = _("Controller Configuration"); /* Initialization dialog contents */ @@ -98,9 +101,9 @@ any ret = MainZFCPSequence(); - UI::CloseDialog(); + Wizard::CloseDialog(); + return ret; } -/* EOF */ } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67424 - in /trunk/dns-server: package/yast2-dns-server.changes src/DnsServer.pm
by locilka＠svn2.opensuse.org 13 Feb '12

13 Feb '12

Author: locilka Date: Mon Feb 13 18:19:00 2012 New Revision: 67424 URL: http://svn.opensuse.org/viewcvs/yast?rev=67424&view=rev Log: - Checking for and adding required LDAP schemas (yast, dnszone) while writing the configuration. Fixed handling if configuration cannot be written to LDAP (bnc#690237). Modified: trunk/dns-server/package/yast2-dns-server.changes trunk/dns-server/src/DnsServer.pm Modified: trunk/dns-server/package/yast2-dns-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/package/yast2-dns-ser… ============================================================================== --- trunk/dns-server/package/yast2-dns-server.changes (original) +++ trunk/dns-server/package/yast2-dns-server.changes Mon Feb 13 18:19:00 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------ +Mon Feb 13 18:06:25 CET 2012 - locilka(a)suse.com + +- Checking for and adding required LDAP schemas (yast, dnszone) + while writing the configuration. Fixed handling if configuration + cannot be written to LDAP (bnc#690237). + +------------------------------------------------------------------ Fri Feb 10 13:13:43 CET 2012 - locilka(a)suse.com - Fixed transforming records from absolute to relative format Modified: trunk/dns-server/src/DnsServer.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/src/DnsServer.pm?rev=… ============================================================================== --- trunk/dns-server/src/DnsServer.pm (original) +++ trunk/dns-server/src/DnsServer.pm Mon Feb 13 18:19:00 2012 @@ -1281,7 +1281,10 @@ # authenticate to LDAP if ($use_ldap) { - LdapPrepareToWrite (); + unless (LdapPrepareToWrite ()) { + y2error ("Cannot write to LDAP"); + return 0; + } } foreach my $z (@zones) { @@ -1790,6 +1793,31 @@ return; } +# Checks whether all required schemas are correctly included +# Gets an LDAP Domain as a parameter +# Returns boolean +sub LdapSchemasPresent ($) { + my $ldap_domain = shift; + my $ret = 1; + local $Data::Dumper::Indent = 0; + + my $default_config = "ou=ldapconfig,".$ldap_domain; + my $dc_ret = Ldap->GetLDAPEntry ($default_config); + y2milestone ("LDAP: Default config (".$default_config.") found: ".Dumper($dc_ret)); + + # Record not found + $ret = 0 if (! defined $dc_ret || keys(%{$dc_ret}) == 0); + + my $dns_zone = "ou=DNS,".$ldap_domain; + my $dz_ret = Ldap->GetLDAPEntry ($dns_zone); + y2milestone ("LDAP: DNS (".$dns_zone.") found: ".Dumper($dz_ret)); + + # Record not found + $ret = 0 if (! defined $dz_ret || keys(%{$dz_ret}) == 0); + + return $ret; +} + BEGIN { $TYPEINFO{LdapPrepareToWrite} = ["function", "boolean"];} sub LdapPrepareToWrite { my $self = shift; @@ -1805,6 +1833,7 @@ || 0 != scalar (@{NetworkInterfaces->Locate ("IPADDR", $ldap_server)})) { y2milestone ("LDAP server is local, checking included schemas"); + LdapServerAccess->AddLdapSchemas(["/etc/openldap/schema/yast.schema"],1); LdapServerAccess->AddLdapSchemas(["/etc/openldap/schema/dnszone.schema"],1); } else @@ -1856,6 +1885,14 @@ } Ldap->SetGUI(YaST::YCP::Boolean(1)); + # If non-local server is used, schemas are not handled but required anyway + # BNC #710430 and BNC #690237 + unless (LdapSchemasPresent($ldap_domain)) { + y2error ("Required schemas not found."); + Report->Error (__("Required LDAP schemas (yast, dnszone) are not included.\nCannot write to LDAP.")); + return 0; + } + # find suseDnsConfiguration object %ldap_query = ( "base_dn" => $ldap_config_dn, @@ -1886,7 +1923,7 @@ my $err = SCR->Read (".ldap.error") || {}; my $err_descr = Dumper ($err); y2error ("Error descr: $err_descr"); - return; + return 0; } %found = %ldap_object; } @@ -1912,7 +1949,7 @@ my $err = SCR->Read (".ldap.error") || {}; my $err_descr = Dumper ($err); y2error ("Error descr: $err_descr"); - return; + return 0; } @bases = ("ou=DNS,$ldap_domain"); } @@ -1947,9 +1984,11 @@ my $err = SCR->Read (".ldap.error") || {}; my $err_descr = Dumper ($err); y2error ("Error descr: $err_descr"); - return; + return 0; } } + + return 1; } BEGIN { $TYPEINFO{LdapStore} = ["function", "void" ]; } -- 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] r67423 - in /branches/SuSE-Code-11-SP2-Branch/dns-server: package/yast2-dns-server.changes src/DnsServer.pm
by locilka＠svn2.opensuse.org 13 Feb '12

13 Feb '12

Author: locilka Date: Mon Feb 13 18:18:46 2012 New Revision: 67423 URL: http://svn.opensuse.org/viewcvs/yast?rev=67423&view=rev Log: - Checking for and adding required LDAP schemas (yast, dnszone) while writing the configuration. Fixed handling if configuration cannot be written to LDAP (bnc#690237). Modified: branches/SuSE-Code-11-SP2-Branch/dns-server/package/yast2-dns-server.changes branches/SuSE-Code-11-SP2-Branch/dns-server/src/DnsServer.pm Modified: branches/SuSE-Code-11-SP2-Branch/dns-server/package/yast2-dns-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/dns-server/package/yast2-dns-server.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/dns-server/package/yast2-dns-server.changes Mon Feb 13 18:18:46 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------ +Mon Feb 13 18:06:25 CET 2012 - locilka(a)suse.com + +- Checking for and adding required LDAP schemas (yast, dnszone) + while writing the configuration. Fixed handling if configuration + cannot be written to LDAP (bnc#690237). + +------------------------------------------------------------------ Fri Feb 10 13:13:43 CET 2012 - locilka(a)suse.com - Fixed transforming records from absolute to relative format Modified: branches/SuSE-Code-11-SP2-Branch/dns-server/src/DnsServer.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/dns-server/src/DnsServer.pm (original) +++ branches/SuSE-Code-11-SP2-Branch/dns-server/src/DnsServer.pm Mon Feb 13 18:18:46 2012 @@ -1281,7 +1281,10 @@ # authenticate to LDAP if ($use_ldap) { - LdapPrepareToWrite (); + unless (LdapPrepareToWrite ()) { + y2error ("Cannot write to LDAP"); + return 0; + } } foreach my $z (@zones) { @@ -1790,6 +1793,31 @@ return; } +# Checks whether all required schemas are correctly included +# Gets an LDAP Domain as a parameter +# Returns boolean +sub LdapSchemasPresent ($) { + my $ldap_domain = shift; + my $ret = 1; + local $Data::Dumper::Indent = 0; + + my $default_config = "ou=ldapconfig,".$ldap_domain; + my $dc_ret = Ldap->GetLDAPEntry ($default_config); + y2milestone ("LDAP: Default config (".$default_config.") found: ".Dumper($dc_ret)); + + # Record not found + $ret = 0 if (! defined $dc_ret || keys(%{$dc_ret}) == 0); + + my $dns_zone = "ou=DNS,".$ldap_domain; + my $dz_ret = Ldap->GetLDAPEntry ($dns_zone); + y2milestone ("LDAP: DNS (".$dns_zone.") found: ".Dumper($dz_ret)); + + # Record not found + $ret = 0 if (! defined $dz_ret || keys(%{$dz_ret}) == 0); + + return $ret; +} + BEGIN { $TYPEINFO{LdapPrepareToWrite} = ["function", "boolean"];} sub LdapPrepareToWrite { my $self = shift; @@ -1805,6 +1833,7 @@ || 0 != scalar (@{NetworkInterfaces->Locate ("IPADDR", $ldap_server)})) { y2milestone ("LDAP server is local, checking included schemas"); + LdapServerAccess->AddLdapSchemas(["/etc/openldap/schema/yast.schema"],1); LdapServerAccess->AddLdapSchemas(["/etc/openldap/schema/dnszone.schema"],1); } else @@ -1856,6 +1885,14 @@ } Ldap->SetGUI(YaST::YCP::Boolean(1)); + # If non-local server is used, schemas are not handled but required anyway + # BNC #710430 and BNC #690237 + unless (LdapSchemasPresent($ldap_domain)) { + y2error ("Required schemas not found."); + Report->Error (__("Required LDAP schemas (yast, dnszone) are not included.\nCannot write to LDAP.")); + return 0; + } + # find suseDnsConfiguration object %ldap_query = ( "base_dn" => $ldap_config_dn, @@ -1886,7 +1923,7 @@ my $err = SCR->Read (".ldap.error") || {}; my $err_descr = Dumper ($err); y2error ("Error descr: $err_descr"); - return; + return 0; } %found = %ldap_object; } @@ -1912,7 +1949,7 @@ my $err = SCR->Read (".ldap.error") || {}; my $err_descr = Dumper ($err); y2error ("Error descr: $err_descr"); - return; + return 0; } @bases = ("ou=DNS,$ldap_domain"); } @@ -1947,9 +1984,11 @@ my $err = SCR->Read (".ldap.error") || {}; my $err_descr = Dumper ($err); y2error ("Error descr: $err_descr"); - return; + return 0; } } + + return 1; } BEGIN { $TYPEINFO{LdapStore} = ["function", "void" ]; } -- 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] r67422 - in /branches/SuSE-Code-11-SP1-Branch/dns-server: package/yast2-dns-server.changes src/DnsServer.pm
by locilka＠svn2.opensuse.org 13 Feb '12

13 Feb '12

Author: locilka Date: Mon Feb 13 18:18:31 2012 New Revision: 67422 URL: http://svn.opensuse.org/viewcvs/yast?rev=67422&view=rev Log: - Checking for and adding required LDAP schemas (yast, dnszone) while writing the configuration. Fixed handling if configuration cannot be written to LDAP (bnc#690237). Modified: branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes branches/SuSE-Code-11-SP1-Branch/dns-server/src/DnsServer.pm Modified: branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes Mon Feb 13 18:18:31 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------ +Mon Feb 13 18:06:25 CET 2012 - locilka(a)suse.com + +- Checking for and adding required LDAP schemas (yast, dnszone) + while writing the configuration. Fixed handling if configuration + cannot be written to LDAP (bnc#690237). + +------------------------------------------------------------------ Fri Feb 10 13:13:43 CET 2012 - locilka(a)suse.com - Fixed transforming records from absolute to relative format Modified: branches/SuSE-Code-11-SP1-Branch/dns-server/src/DnsServer.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/dns-server/src/DnsServer.pm (original) +++ branches/SuSE-Code-11-SP1-Branch/dns-server/src/DnsServer.pm Mon Feb 13 18:18:31 2012 @@ -1281,7 +1281,10 @@ # authenticate to LDAP if ($use_ldap) { - LdapPrepareToWrite (); + unless (LdapPrepareToWrite ()) { + y2error ("Cannot write to LDAP"); + return 0; + } } foreach my $z (@zones) { @@ -1790,6 +1793,31 @@ return; } +# Checks whether all required schemas are correctly included +# Gets an LDAP Domain as a parameter +# Returns boolean +sub LdapSchemasPresent ($) { + my $ldap_domain = shift; + my $ret = 1; + local $Data::Dumper::Indent = 0; + + my $default_config = "ou=ldapconfig,".$ldap_domain; + my $dc_ret = Ldap->GetLDAPEntry ($default_config); + y2milestone ("LDAP: Default config (".$default_config.") found: ".Dumper($dc_ret)); + + # Record not found + $ret = 0 if (! defined $dc_ret || keys(%{$dc_ret}) == 0); + + my $dns_zone = "ou=DNS,".$ldap_domain; + my $dz_ret = Ldap->GetLDAPEntry ($dns_zone); + y2milestone ("LDAP: DNS (".$dns_zone.") found: ".Dumper($dz_ret)); + + # Record not found + $ret = 0 if (! defined $dz_ret || keys(%{$dz_ret}) == 0); + + return $ret; +} + BEGIN { $TYPEINFO{LdapPrepareToWrite} = ["function", "boolean"];} sub LdapPrepareToWrite { my $self = shift; @@ -1805,6 +1833,7 @@ || 0 != scalar (@{NetworkInterfaces->Locate ("IPADDR", $ldap_server)})) { y2milestone ("LDAP server is local, checking included schemas"); + LdapServerAccess->AddLdapSchemas(["/etc/openldap/schema/yast.schema"],1); LdapServerAccess->AddLdapSchemas(["/etc/openldap/schema/dnszone.schema"],1); } else @@ -1856,6 +1885,14 @@ } Ldap->SetGUI(YaST::YCP::Boolean(1)); + # If non-local server is used, schemas are not handled but required anyway + # BNC #710430 and BNC #690237 + unless (LdapSchemasPresent($ldap_domain)) { + y2error ("Required schemas not found."); + Report->Error (__("Required LDAP schemas (yast, dnszone) are not included.\nCannot write to LDAP.")); + return 0; + } + # find suseDnsConfiguration object %ldap_query = ( "base_dn" => $ldap_config_dn, @@ -1886,7 +1923,7 @@ my $err = SCR->Read (".ldap.error") || {}; my $err_descr = Dumper ($err); y2error ("Error descr: $err_descr"); - return; + return 0; } %found = %ldap_object; } @@ -1912,7 +1949,7 @@ my $err = SCR->Read (".ldap.error") || {}; my $err_descr = Dumper ($err); y2error ("Error descr: $err_descr"); - return; + return 0; } @bases = ("ou=DNS,$ldap_domain"); } @@ -1947,9 +1984,11 @@ my $err = SCR->Read (".ldap.error") || {}; my $err_descr = Dumper ($err); y2error ("Error descr: $err_descr"); - return; + return 0; } } + + return 1; } BEGIN { $TYPEINFO{LdapStore} = ["function", "void" ]; } -- 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] r67421 - /tags/stable-2_22_1/ncurses/
by gs＠svn2.opensuse.org 13 Feb '12

13 Feb '12

Author: gs Date: Mon Feb 13 14:06:07 2012 New Revision: 67421 URL: http://svn.opensuse.org/viewcvs/yast?rev=67421&view=rev Log: Created tag stable-2_22_1 for ncurses Added: tags/stable-2_22_1/ncurses/ - copied from r67420, trunk/ncurses/ -- 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] r67420 - /trunk/installation/control/control.openSUSE.xml
by coolo＠svn2.opensuse.org 13 Feb '12

13 Feb '12

Author: coolo Date: Mon Feb 13 13:26:36 2012 New Revision: 67420 URL: http://svn.opensuse.org/viewcvs/yast?rev=67420&view=rev Log: update repo urls Modified: trunk/installation/control/control.openSUSE.xml Modified: trunk/installation/control/control.openSUSE.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.ope… ============================================================================== --- trunk/installation/control/control.openSUSE.xml (original) +++ trunk/installation/control/control.openSUSE.xml Mon Feb 13 13:26:36 2012 @@ -200,9 +200,9 @@ <extra_urls config:type="list">  <extra_url> - <baseurl>http://download.opensuse.org/update/12.1/</baseurl> + <baseurl>http://download.opensuse.org/update/12.2/</baseurl> <alias>repo-update</alias> - <name>openSUSE-12.1-Update</name> + <name>openSUSE-12.2-Update</name> <prod_dir>/</prod_dir> <enabled config:type="boolean">true</enabled> <autorefresh config:type="boolean">true</autorefresh> @@ -211,36 +211,36 @@  <extra_url> - <baseurl>http://download.opensuse.org/distribution/12.1/repo/oss/</baseurl> + <baseurl>http://download.opensuse.org/distribution/12.2/repo/oss/</baseurl> <alias>repo-oss</alias> - <name>openSUSE-12.1-Oss</name> + <name>openSUSE-12.2-Oss</name> <prod_dir>/</prod_dir> <enabled config:type="boolean">true</enabled> <autorefresh config:type="boolean">true</autorefresh> <priority config:type="integer">99</priority> </extra_url> <extra_url> - <baseurl>http://download.opensuse.org/distribution/12.1/repo/non-oss/</baseurl> + <baseurl>http://download.opensuse.org/distribution/12.2/repo/non-oss/</baseurl> <alias>repo-non-oss</alias> - <name>openSUSE-12.1-Non-Oss</name> + <name>openSUSE-12.2-Non-Oss</name> <prod_dir>/</prod_dir> <enabled config:type="boolean">true</enabled> <autorefresh config:type="boolean">true</autorefresh> <priority config:type="integer">99</priority> </extra_url> <extra_url> - <baseurl>http://download.opensuse.org/debug/distribution/12.1/repo/oss/</baseurl> + <baseurl>http://download.opensuse.org/debug/distribution/12.2/repo/oss/</baseurl> <alias>repo-debug</alias> - <name>openSUSE-12.1-Debug</name> + <name>openSUSE-12.2-Debug</name> <prod_dir>/</prod_dir> <enabled config:type="boolean">false</enabled> <autorefresh config:type="boolean">true</autorefresh> <priority config:type="integer">99</priority> </extra_url> <extra_url> - <baseurl>http://download.opensuse.org/debug/update/12.1/</baseurl> + <baseurl>http://download.opensuse.org/debug/update/12.2/</baseurl> <alias>repo-debug-update</alias> - <name>openSUSE-12.1-Update-Debug</name> + <name>openSUSE-12.2-Update-Debug</name> <prod_dir>/</prod_dir> <enabled config:type="boolean">false</enabled> <autorefresh config:type="boolean">true</autorefresh> @@ -248,9 +248,9 @@ </extra_url> <extra_url> - <baseurl>http://download.opensuse.org/source/distribution/12.1/repo/oss/</baseurl> + <baseurl>http://download.opensuse.org/source/distribution/12.2/repo/oss/</baseurl> <alias>repo-source</alias> - <name>openSUSE-12.1-Source</name> + <name>openSUSE-12.2-Source</name> <prod_dir>/</prod_dir> <enabled config:type="boolean">false</enabled> <autorefresh config:type="boolean">true</autorefresh> -- 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] r67419 - in /trunk/ncurses: VERSION package/yast2-ncurses.changes
by gs＠svn2.opensuse.org 13 Feb '12

13 Feb '12

Author: gs Date: Mon Feb 13 13:15:43 2012 New Revision: 67419 URL: http://svn.opensuse.org/viewcvs/yast?rev=67419&view=rev Log: 2.22.1 Modified: trunk/ncurses/VERSION trunk/ncurses/package/yast2-ncurses.changes Modified: trunk/ncurses/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/VERSION?rev=67419&r1=674… ============================================================================== --- trunk/ncurses/VERSION (original) +++ trunk/ncurses/VERSION Mon Feb 13 13:15:43 2012 @@ -1 +1 @@ -2.22.0 +2.22.1 Modified: trunk/ncurses/package/yast2-ncurses.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/package/yast2-ncurses.ch… ============================================================================== --- trunk/ncurses/package/yast2-ncurses.changes (original) +++ trunk/ncurses/package/yast2-ncurses.changes Mon Feb 13 13:15:43 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Feb 13 13:09:45 CET 2012 - gs(a)suse.de + +- NCRichText: interpret html tags inside <pre> </pre> + (bnc #724119, bnc #737752) +- V 2.22.1 + +------------------------------------------------------------------- Wed Dec 21 12:23:41 CET 2011 - gs(a)suse.de - Confirmed license -- 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] r67418 - in /trunk/ncurses/src: NCtext.cc NCurses.h
by gs＠svn2.opensuse.org 13 Feb '12

13 Feb '12

Author: gs Date: Mon Feb 13 12:32:04 2012 New Revision: 67418 URL: http://svn.opensuse.org/viewcvs/yast?rev=67418&view=rev Log: remove \r from text, respect tabs for calculation of columns Modified: trunk/ncurses/src/NCtext.cc trunk/ncurses/src/NCurses.h Modified: trunk/ncurses/src/NCtext.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCtext.cc?rev=67418&… ============================================================================== --- trunk/ncurses/src/NCtext.cc (original) +++ trunk/ncurses/src/NCtext.cc Mon Feb 13 12:32:04 2012 @@ -46,6 +46,7 @@ #include <wchar.h> // wcwidth #include <langinfo.h> +#include <boost/algorithm/string.hpp> const NCstring NCtext::emptyStr; @@ -81,7 +82,7 @@ if ( ntext.str().empty() ) return; - const wstring & text( ntext.str() ); + wstring text( ntext.str() ); wstring::size_type spos = 0; @@ -89,6 +90,9 @@ bool sawnl = false; // saw new line + // handle DOS text + boost::erase_all( text, L"\r" ); + while (( cpos = text.find( L'\n', spos ) ) != wstring::npos ) { if ( sawnl ) @@ -119,8 +123,11 @@ if ( ntext.str().empty() ) return; - const wstring & text( ntext.str() ); + wstring text( ntext.str() ); + // handle DOS text + boost::erase_all( text, L"\r" ); + wstring::size_type spos = 0; wstring::size_type cpos = wstring::npos; @@ -194,7 +201,10 @@ for ( wstr_it = ( *line ).str().begin(); wstr_it != ( *line ).str().end() ; ++wstr_it ) { - tmp_len += wcwidth( *wstr_it ); + if ( iswprint( *wstr_it ) ) + tmp_len += wcwidth( *wstr_it ); + else if ( *wstr_it == L'\t' ) + tmp_len += NCurses::tabsize(); } if ( tmp_len > llen ) Modified: trunk/ncurses/src/NCurses.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCurses.h?rev=67418&… ============================================================================== --- trunk/ncurses/src/NCurses.h (original) +++ trunk/ncurses/src/NCurses.h Mon Feb 13 12:32:04 2012 @@ -207,6 +207,8 @@ static int lines() { return ::LINES; } + static int tabsize() { return ::TABSIZE; } + void run(); public: -- 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] r67417 - /trunk/ncurses/src/NCRichText.cc
by gs＠svn2.opensuse.org 13 Feb '12

13 Feb '12

Author: gs Date: Mon Feb 13 12:09:37 2012 New Revision: 67417 URL: http://svn.opensuse.org/viewcvs/yast?rev=67417&view=rev Log: use boost::replace_all Modified: trunk/ncurses/src/NCRichText.cc Modified: trunk/ncurses/src/NCRichText.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCRichText.cc?rev=67… ============================================================================== --- trunk/ncurses/src/NCRichText.cc (original) +++ trunk/ncurses/src/NCRichText.cc Mon Feb 13 12:09:37 2012 @@ -45,6 +45,7 @@ #include "stringutil.h" #include "stdutil.h" #include <sstream> +#include <boost/algorithm/string.hpp> #include "YMenuItem.h" #include "YApplication.h" @@ -420,6 +421,10 @@ } +// +// Calculate longest line of text in <pre> </pre> tags +// and adjust the pad accordingly +// void NCRichText::AdjustPrePad( const wchar_t *osch ) { const wchar_t * wch = osch; @@ -443,14 +448,10 @@ // resolve the entities to get correct length for calculation of longest line wtxt = filterEntities( wtxt ); - wstring to_repl = L" "; - size_t pos; - // replace by \n to get appropriate lines in NCtext - for ( ; (pos = wtxt.find( to_repl )) != wstring::npos ; ) - wtxt.replace( pos, to_repl.length(), L"\n" ); - - yuiDebug() << "Input: " << wtxt << " olen: " << wch - osch << endl; + boost::replace_all( wtxt, L" ", L"\n" ); + + yuiDebug() << "Text: " << wtxt << " initial length: " << wch - osch << endl; NCstring nctxt( wtxt ); NCtext ftext( nctxt ); -- 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] r67416 - in /trunk/s390/src: dasd/dialogs.ycp modules/DASDController.ycp modules/ZFCPController.ycp zfcp/dialogs.ycp
by aschnell＠svn2.opensuse.org 10 Feb '12

10 Feb '12

Author: aschnell Date: Fri Feb 10 17:47:54 2012 New Revision: 67416 URL: http://svn.opensuse.org/viewcvs/yast?rev=67416&view=rev Log: - removed defines and double back ticks Modified: trunk/s390/src/dasd/dialogs.ycp trunk/s390/src/modules/DASDController.ycp trunk/s390/src/modules/ZFCPController.ycp trunk/s390/src/zfcp/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 Fri Feb 10 17:47:54 2012 @@ -440,7 +440,8 @@ * Run the dialog for adding DASDs * @return symbol from AddDASDDiskDialog */ -define symbol AddDASDDiskDialog () ``{ +symbol AddDASDDiskDialog () +{ if (! Mode::config ()) { y2error ("DASD Add Disk dialog shouldn't be run in Mode::config ()"); 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 Fri Feb 10 17:47:54 2012 @@ -31,12 +31,12 @@ global map<string, boolean> diag = $[]; -global define void ActivateDisk (string channel, boolean diag); -global define void DeactivateDisk (string channel, boolean diag); -global define void ProbeDisks (); -global define void FormatDisks (list<string> disks_list, integer par, +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 define string GetPartitionInfo (string disk); +global string GetPartitionInfo (string disk); boolean disk_configured = false; @@ -71,7 +71,8 @@ * Abort function * @return blah blah lahjk */ -global define boolean Abort() ``{ +global boolean Abort() +{ if(AbortFunction != nil) return AbortFunction (); return false; @@ -297,43 +298,38 @@ return $[ "install":[], "remove":[] ]; } + /** * Check if DASD subsystem is available * @return boolean True if more than one disk */ -global define boolean IsAvailable () { - list<map<string,any> > disks = (list<map<string,any> >) - SCR::Read (.probe.disk); - - disks = filter (map<string,any> d, disks, ``( - tolower (d["device"]:"") == "dasd" - )); +global boolean IsAvailable() +{ + 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"; }); integer count = size (disks); y2milestone ("Detected %1 DASD disks", count); - return (count > 0); + return count > 0; } /** * Probe for DASD disks */ -global define void ProbeDisks () { +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, ``( - tolower (d["device"]:"") == "dasd" - )); - - disks = maplist (map<string,any> d, 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; @@ -362,7 +358,7 @@ return d; }); integer index = -1; - DASDController::devices = listmap (map<string,any> d, disks, ``{ + DASDController::devices = listmap (map<string,any> d, disks, { index = index + 1; return $[ index : d ]; }); @@ -408,7 +404,8 @@ * @param id integer chanel id of the device * @param ret integer exit code of the operation */ -define void ReportActivationError (any id, integer ret) { +void ReportActivationError(any id, integer ret) +{ if (ret != 0) { if (ret == 1) @@ -459,7 +456,8 @@ * @param channel string Name of the disk to activate * @param diag boolean Activate DIAG or not */ -global define void ActivateDisk (string channel, boolean diag) { +global void ActivateDisk(string channel, boolean diag) +{ // if (! Arch::s390_32 ()) diag = false; string command = sformat ( "/sbin/dasd_configure '%1' '%2' '%3'", @@ -503,7 +501,8 @@ * @param channel string Name of the disk to deactivate * @param diag boolean Activate DIAG or not */ -global define void DeactivateDisk (string channel, boolean diag) { +global void DeactivateDisk(string channel, boolean diag) +{ // if (! Arch::s390_32 ()) diag = false; string command = sformat ( "/sbin/dasd_configure '%1' '%2' '%3'", @@ -524,8 +523,8 @@ * @param write_vl boolean Write a Volume label * @param interactive boolean Interactive yes/no */ -global define 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, + boolean interactive) { if (par > size (disks_list)) par = size (disks_list); 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 Fri Feb 10 17:47:54 2012 @@ -32,8 +32,8 @@ map<string,boolean> activated_controllers = $[]; -global define void ActivateDisk (string channel, string wwpn, string lun); -global define void ProbeDisks(); +global void ActivateDisk(string channel, string wwpn, string lun); +global void ProbeDisks(); boolean disk_configured = false; @@ -87,11 +87,13 @@ */ global boolean() AbortFunction = Modified; + /** * Abort function * @return blah blah lahjk */ -global define boolean Abort() ``{ +global boolean Abort() +{ if(AbortFunction != nil) return AbortFunction (); return false; @@ -274,7 +276,8 @@ * Get available zfcp controllers * @return list<map<string,any> > of availabel Controllers */ -global define list<map<string,any> > GetControllers () { +global list<map<string, any> > GetControllers() +{ if (controllers == nil) { controllers = (list<map<string,any> >)SCR::Read (.probe.storage); @@ -330,7 +333,8 @@ * @param id integer chanel id of the device * @param ret integer exit code of the operation */ -define void ReportActivationError (any id, integer ret) { +void ReportActivationError(any id, integer ret) +{ if (ret != 0) { if (ret == 1) @@ -381,7 +385,8 @@ * @param id integer chanel id of the device * @param ret integer exit code of the operation */ -define void ReportControllerActivationError (any id, integer ret) { +void ReportControllerActivationError(any id, integer ret) +{ if (ret != 0) { if (ret == 1) @@ -421,8 +426,8 @@ * @param wwpn string wwpn (hexa number) * @param lun string lun (hexa number) */ -global define void ActivateDisk (string channel, string wwpn, string lun) { - +global void ActivateDisk(string channel, string wwpn, string lun) +{ if (! activated_controllers[channel]:false) { string command = sformat ( @@ -462,7 +467,8 @@ * @param wwpn string wwpn (hexa number) * @param lun string lun (hexa number) */ -global define void DeactivateDisk (string channel, string wwpn, string lun) { +global void DeactivateDisk(string channel, string wwpn, string lun) +{ string command = sformat ( "/sbin/zfcp_disk_configure '%1' '%2' '%3' '%4'", channel, Modified: trunk/s390/src/zfcp/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/zfcp/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/zfcp/dialogs.ycp (original) +++ trunk/s390/src/zfcp/dialogs.ycp Fri Feb 10 17:47:54 2012 @@ -145,7 +145,8 @@ * Show the ZFCP-Dialog * @return symbol From the dialog */ -define symbol ZFCPDialog () ``{ +symbol ZFCPDialog() +{ DisplayZFCPDialog (); ReloadZFCPDialog (); @@ -216,7 +217,8 @@ * Add ZFCP-Dialog * @return symbol the dialog */ -define symbol AddZFCPDiskDialog () ``{ +symbol AddZFCPDiskDialog() +{ /* Minimal text for the help */ string help = ZFCP_HELPS["disk_add"]:""; @@ -229,7 +231,7 @@ integer i_lun = tointeger (fcp_lun); integer new_lun = i_lun; - foreach (integer k, map<string,any> v, ZFCPController::devices, ``{ + foreach (integer k, map<string,any> v, ZFCPController::devices, { if (i_lun == tointeger (v["detail", "fcp_lun"]:"")) { if (v["vendor"]:"" == "IBM" && v["device"]:"" == "25f03") @@ -245,19 +247,15 @@ list<string>items = []; if (Mode::config ()) { - items = maplist (integer index, map<string,any> d, - ZFCPController::devices, - { + items = maplist (integer index, map<string, any> d, ZFCPController::devices, { return d["detail", "controller_id"]:""; }); items = toset (items); - items = filter (string i, items, ``(i != "" && i != nil)); + items = filter (string i, items, { return i != "" && i != nil; }); } else { - items = maplist (map<string,any> c, - ZFCPController::GetControllers (), - ``{ + items = maplist (map<string, any> c, ZFCPController::GetControllers(), { string channel = c["sysfs_bus_id"]:"0.0.0000"; return channel; }); -- 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] r67415 - /trunk/s390/src/modules/DASDController.ycp
by aschnell＠svn2.opensuse.org 10 Feb '12

10 Feb '12

Author: aschnell Date: Fri Feb 10 17:30:40 2012 New Revision: 67415 URL: http://svn.opensuse.org/viewcvs/yast?rev=67415&view=rev Log: - replaced background by process agent 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 Fri Feb 10 17:30:40 2012 @@ -533,7 +533,7 @@ map<integer,string> disks = $[]; list<string> disks_cmd = []; integer index = -1; - foreach (string device, disks_list, ``{ + foreach (string device, disks_list, { index = index + 1; disks[index] = device; disks_cmd = add(disks_cmd, sformat("-f '%1'", device)); @@ -551,52 +551,59 @@ index = 0; while (index < par) { - contents = add (contents, `ProgressBar (`id (index), " ", 100, 0)); + // progress bar + contents = add(contents, `ProgressBar(`id(index), sformat(_("Formatting %1:"), + disks[index]:""), 100, 0)); index = index + 1; } UI::OpenDialog (contents); map<integer,integer> cylinders = $[]; map<integer,integer> done = $[]; // start formatting on background - any ret = SCR::Execute (.background.run_output, command); - y2milestone ("Background start returned %1", ret); + integer process_id = (integer) SCR::Execute(.process.start_shell, command); + y2milestone ("Process start returned %1", process_id); // get the sizes of all disks index = 0; while (index < size (disks)) { y2milestone ("Running first formatting cycle"); sleep (500); - if (! (boolean)SCR::Read (.background.isrunning)) + + if (!(boolean) SCR::Read(.process.running, process_id)) { UI::CloseDialog (); - integer iret = (integer)SCR::Read (.background.status); + integer iret = (integer) SCR::Read(.process.status, process_id); // error report, %1 is exit code of the command (integer) Report::Error (sformat (_("Disks formatting failed. Exit code: %1."), iret)); return; } - list new_lines = (list) SCR::Read (.background.newout); - foreach (any line, new_lines, { - integer siz = tointeger (line); + + while (index < size (disks)) + { + string line = (string) SCR::Read(.process.read_line, process_id); + if (line == nil) + break; + + integer siz = tointeger (line); if (siz == 0) siz = 999999999; cylinders[index] = siz; index = index + 1; - }); + } } y2milestone ("Sizes of disks: %1", cylinders); y2milestone ("Disks to format: %1", disks); list<integer> last_step = []; string last_rest = ""; - while ((boolean)SCR::Read (.background.isrunning)) + while ((boolean) SCR::Read(.process.running, process_id)) { sleep (1000); - string buffer = sformat ("%1", - SCR::Read (.background.buffer_out)); + string buffer = (string) SCR::Read(.process.read, process_id); buffer = last_rest + buffer; list<string> progress = splitstring (buffer, "|"); map<integer,integer> this_step = $[]; - if ((boolean)SCR::Read (.background.isrunning)) + if ((boolean) SCR::Read(.process.running, process_id)) { integer last = size (progress) - 1; last_rest = progress[last]:""; @@ -629,7 +636,7 @@ index = 0; integer siz = size (this_step); foreach (integer k, integer v, this_step, { - UI::ChangeWidget (`id (index), `Label, sformat ( + UI::ChangeWidget(`id(index), `Label, sformat( // progress bar, %1 is device name, %2 and %3 // integers, // eg. Formatting /dev/dasda: cylinder 123 of 12334 done @@ -637,9 +644,8 @@ disks[k]:"", done[k]:0, cylinders[k]:0)); - UI::ChangeWidget (`id (index), `Value, - 100 * done[k]:0 / cylinders[k]:1); - UI::ChangeWidget (`id (index), `Enabled, true); + UI::ChangeWidget(`id(index), `Value, 100 * done[k]:0 / cylinders[k]:1); + UI::ChangeWidget(`id(index), `Enabled, true); index = index + 1; }); while (index < par) @@ -651,7 +657,7 @@ } } UI::CloseDialog (); - integer iret = (integer)SCR::Read (.background.status); + integer iret = (integer) SCR::Read(.process.status, process_id); if (iret != 0) { // error report, %1 is exit code of the command (integer) -- 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] r67414 - /trunk/s390/src/dasd/dialogs.ycp
by aschnell＠svn2.opensuse.org 10 Feb '12

10 Feb '12

Author: aschnell Date: Fri Feb 10 16:48:08 2012 New Revision: 67414 URL: http://svn.opensuse.org/viewcvs/yast?rev=67414&view=rev Log: - added comments for translators 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 Fri Feb 10 16:48:08 2012 @@ -257,6 +257,7 @@ list<integer> selected = ListSelectedDASD(); if (isempty(selected)) { + // error popup message Popup::Message (_("No disk selected.")); ret = nil; continue; @@ -337,9 +338,10 @@ } else if (ret == `format) { - list<integer> selected = ListSelectedDASD (); + list<integer> selected = ListSelectedDASD(); if (isempty(selected)) { + // error popup message Popup::Message (_("No disk selected.")); ret = nil; continue; -- 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] r67413 - /trunk/s390/src/modules/DASDController.ycp
by aschnell＠svn2.opensuse.org 10 Feb '12

10 Feb '12

Author: aschnell Date: Fri Feb 10 16:35:15 2012 New Revision: 67413 URL: http://svn.opensuse.org/viewcvs/yast?rev=67413&view=rev Log: - readded option -Y for dasdfmt (see bnc #446998) 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 Fri Feb 10 16:35:15 2012 @@ -542,9 +542,8 @@ string additional_param = ""; if (! write_vl) additional_param = "--no-label"; - string command = sformat ( - "/sbin/dasdfmt -P %2 -b 4096 -y -m 1 %3 %1", disks_param, par, - additional_param); + string command = sformat("/sbin/dasdfmt -Y -P %2 -b 4096 -y -m 1 %3 %1", + disks_param, par, additional_param); y2milestone ("Running command %1", command); index = 0; -- 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] r67412 - in /trunk/s390: package/yast2-s390.changes src/dasd/dialogs.ycp src/modules/DASDController.ycp src/modules/ZFCPController.ycp src/zfcp/dialogs.ycp
by aschnell＠svn2.opensuse.org 10 Feb '12

10 Feb '12

Author: aschnell Date: Fri Feb 10 15:02:29 2012 New Revision: 67412 URL: http://svn.opensuse.org/viewcvs/yast?rev=67412&view=rev Log: - use multiselection table in main dasd dialog - added quoting to program execution - changed initial filter_max to 0.0.ffff (recommended by Ihno) Modified: trunk/s390/package/yast2-s390.changes trunk/s390/src/dasd/dialogs.ycp trunk/s390/src/modules/DASDController.ycp trunk/s390/src/modules/ZFCPController.ycp trunk/s390/src/zfcp/dialogs.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 Fri Feb 10 15:02:29 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Feb 10 14:59:45 CET 2012 - aschnell(a)suse.de + +- used multiselection table in main DASD dialog + +------------------------------------------------------------------- Wed Dec 7 10:04:50 UTC 2011 - coolo(a)suse.com - fix license to be in spdx.org format 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 Fri Feb 10 15:02:29 2012 @@ -22,28 +22,18 @@ include "s390/dasd/helps.ycp"; -/** - * List DASD devices that are currently being selected - * @return list<integer> list of IDs of selected DASD devices - */ -define list<integer> ListSelectedDASD () ``{ - map<integer, boolean> sel_list = (map<integer, boolean>)filter ( - integer k, boolean v, DASDController::selected, - ``( - v == true - )); - list<integer> to_activate = maplist (integer k, boolean v, sel_list, ``(k)); - y2milestone ("Selected list: %1", to_activate); - return to_activate; -} - - -// -------------------------------------------------------------------------- - - + /** + * List DASD devices that are currently being selected + * @return list<integer> list of IDs of selected DASD devices + */ + list<integer> ListSelectedDASD() + { + list<integer> selected = (list<integer>) UI::QueryWidget(`id(`table), `SelectedItems); + y2milestone("selected %1", selected); + return selected; + } -// now real dialogs /** * Read settings dialog @@ -92,10 +82,9 @@ { items = maplist(integer k, map<string, any> d, devices, { boolean active = d["resource", "io", 0, "active"]:false; - integer channel = d["resource", "io", 0, "start"]:0; - string str_channel = d["channel"]:""; + string channel = d["channel"]:""; string access = toupper(d["resource", "io", 0, "mode"]:"RO"); - string diag = String::YesNo(DASDController::diag[str_channel]:false); + string diag = String::YesNo(DASDController::diag[channel]:false); string device = d["dev_name"]:""; string type = toupper(sformat("%1/%2, %3/%4", substring(tohexstring(d["device_id"]:0 & 0xffff, 4), 2), @@ -107,11 +96,6 @@ string formatted = String::YesNo(d["formatted"]:false); string partition_info = d["partition_info"]:"--"; - string selected = DASDController::selected[k]:false - // table cell - ? _("Yes") - : "-"; - if (!active) { type = "--"; @@ -121,7 +105,7 @@ device = "--"; } - return `item(`id(k), selected, str_channel, device, type, access, diag, formatted, + return `item(`id(k), channel, device, type, access, diag, formatted, partition_info); }); } @@ -146,8 +130,6 @@ term header = `header( // table header - _("Sel."), - // table header `Right(_("Channel")), // table header _("Device"), @@ -201,7 +183,7 @@ `PushButton (`id (`filter), _("&Filter")) ) ), - `Table(`id(`table), `opt(`notify), header, []), + `Table(`id(`table), `opt(`multiSelection), header, []), Mode::config () ? `HBox ( // push button @@ -211,8 +193,6 @@ `HStretch () ) : `HBox ( - // pudh button - `PushButton (`id (`select), _("&Select or Deselect")), `HStretch (), // menu button `MenuButton (`id (`operation), _("Perform &Action"), actions) @@ -237,14 +217,17 @@ DASDController::filter_min = (string) UI::QueryWidget(`min_chan, `Value); DASDController::filter_max = (string) UI::QueryWidget(`max_chan, `Value); - DASDController::ProbeDisks (); + DASDController::ProbeDisks(); list<term> items = GetDASDDiskItems(); + list<integer> selected = (list<integer>) UI::QueryWidget(`id(`table), `SelectedItems); UI::ChangeWidget(`id(`table), `Items, items); - UI::SetFocus (`table); + UI::ChangeWidget(`id(`table), `SelectedItems, selected); + UI::SetFocus(`table); } + /** * Run the dialog for DASD disks configuration * @return symbol for wizard sequencer @@ -259,72 +242,53 @@ { ret = UI::UserInput(); - integer selected = (integer) UI::QueryWidget(`id(`table), `CurrentItem); - if (ret == `filter) { ReloadDASDDialog (); ret = nil; continue; } - else if (ret == `table || ret == `select) + else if (ret == `table) { - DASDController::selected[selected] - = ! DASDController::selected[selected]:false; - UI::ChangeWidget (`id (`table), `Item (selected, 0), - DASDController::selected[selected]:false - // table cell - ? _("Yes") - : "-"); ret = nil; - UI::SetFocus (`table); continue; } else if (ret == `activate) { - list<integer>to_activate = ListSelectedDASD (); - if (0 == size (to_activate)) + list<integer> selected = ListSelectedDASD(); + if (isempty(selected)) { Popup::Message (_("No disk selected.")); ret = nil; continue; } - foreach (integer id, to_activate, ``{ + + foreach (integer id, selected, { string channel = DASDController::devices[id,"channel"]:""; boolean diag = DASDController::diag[channel]:false; - DASDController::ActivateDisk ( - channel, - diag - ); + DASDController::ActivateDisk(channel, diag); }); ReloadDASDDialog (); - -// UI::ChangeWidget(`id(`table), `CurrentItem, ids_to_activate[0]:nil); ret = nil; - } else if (ret == `deactivate) { - list<integer>to_activate = ListSelectedDASD (); - if (0 == size (to_activate)) + list<integer> selected = ListSelectedDASD(); + if (isempty(selected)) { // error popup message Popup::Message (_("No disk selected.")); ret = nil; continue; } - foreach (integer id, to_activate, ``{ + + foreach (integer id, selected, { string channel = DASDController::devices[id,"channel"]:""; boolean diag = DASDController::diag[channel]:false; - DASDController::DeactivateDisk ( - channel, - diag - ); + DASDController::DeactivateDisk(channel, diag); }); ReloadDASDDialog (); - -// UI::ChangeWidget(`id(`table), `CurrentItem, ids_to_activate[0]:nil); ret = nil; } else if (ret == `diag_on) @@ -347,8 +311,6 @@ }); ReloadDASDDialog (); - -// UI::ChangeWidget(`id(`table), `CurrentItem, ids_to_activate[0]:nil); ret = nil; } else if (ret == `diag_off) @@ -371,26 +333,23 @@ }); ReloadDASDDialog (); - -// UI::ChangeWidget(`id(`table), `CurrentItem, ids_to_activate[0]:nil); ret = nil; } else if (ret == `format) { - list<integer>to_activate = ListSelectedDASD (); - if (0 == size (to_activate)) + list<integer> selected = ListSelectedDASD (); + if (isempty(selected)) { Popup::Message (_("No disk selected.")); ret = nil; continue; } + // check if disks are R/W and active string problem = ""; - foreach (integer id, to_activate, { - boolean active = (boolean) - (DASDController::devices[id, "resource", "io", 0, "active"]:false); - string access = toupper ( - (string)(DASDController::devices[id, "resource", "io", 0, "mode"]:"RO")); + 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) { // error report, %1 is device identification @@ -412,8 +371,8 @@ continue; } integer par = 8; - if (par > size (to_activate)) - par = size (to_activate); + if (par > size (selected)) + par = size (selected); boolean cancel = false; UI::OpenDialog (`VBox ( `IntField (`id (`par), @@ -428,9 +387,8 @@ ) )); ret = UI::UserInput (); - par = (integer)UI::QueryWidget (`id (`par), `Value); - boolean write_vl = (boolean) - UI::QueryWidget (`id (`write_label), `Value); + par = (integer) UI::QueryWidget(`id(`par), `Value); + boolean write_vl = (boolean) UI::QueryWidget(`id(`write_label), `Value); UI::CloseDialog (); if (ret == `cancel) { @@ -440,7 +398,7 @@ } // final confirmation before formatting the discs - list<string> channels = maplist (integer id, to_activate, { + list<string> channels = maplist (integer id, selected, { return DASDController::devices[id, "channel"]:""; }); string channels_str = mergestring (channels, ", "); @@ -464,7 +422,7 @@ } // final confirmation -- end - list<string> devices = maplist (integer id, to_activate, ``{ + list<string> devices = maplist (integer id, selected, { return DASDController::devices[id, "dev_name"]:""; }); DASDController::FormatDisks (devices, par, write_vl, true); @@ -548,7 +506,6 @@ } return (symbol) 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 Fri Feb 10 15:02:29 2012 @@ -25,10 +25,8 @@ global map<integer,map<string,any> > devices = $[]; -global map<integer, boolean> selected = $[]; - global string filter_min = "0.0.0000"; - global string filter_max = "f.f.ffff"; + global string filter_max = "0.0.ffff"; global map<string, boolean> diag = $[]; @@ -343,7 +341,7 @@ { string device = d["dev_name"]:""; map scr_out = (map)SCR::Execute (.target.bash_output, sformat ( - "dasdview -x -f %1 | grep formatted", device)); + "dasdview -x -f '%1' | grep formatted", device)); boolean formatted = false; if (scr_out["exit"]:0 == 0) { @@ -464,7 +462,7 @@ global define void ActivateDisk (string channel, boolean diag) { // if (! Arch::s390_32 ()) diag = false; string command = sformat ( - "/sbin/dasd_configure %1 %2 %3", + "/sbin/dasd_configure '%1' '%2' '%3'", channel, 1, diag ? 1 : 0 @@ -479,7 +477,7 @@ if ((Mode::autoinst() && Popup::TimedOKCancel(popup, 10)) || Popup::ContinueCancel (popup)) { - string cmd = sformat("ls /sys/bus/ccw/devices/%1/block/|tr -d '\n'", 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 && size(disk["stdout"]:"")>0){ FormatDisks ([ sformat("/dev/%1", disk["stdout"]:"") ], 1, true, true); @@ -508,7 +506,7 @@ global define void DeactivateDisk (string channel, boolean diag) { // if (! Arch::s390_32 ()) diag = false; string command = sformat ( - "/sbin/dasd_configure %1 %2 %3", + "/sbin/dasd_configure '%1' '%2' '%3'", channel, 0, diag ? 1 : 0 @@ -538,7 +536,7 @@ foreach (string device, disks_list, ``{ index = index + 1; disks[index] = device; - disks_cmd = add (disks_cmd, sformat ("-f %1", device)); + disks_cmd = add(disks_cmd, sformat("-f '%1'", device)); }); string disks_param = mergestring (disks_cmd, " "); string additional_param = ""; @@ -668,9 +666,9 @@ * @param disk string Disk to read info from * @return GetPartitionInfo string The info */ -global define string GetPartitionInfo (string disk) { - map outmap = (map)SCR::Execute (.target.bash_output, sformat ( - "/sbin/fdasd -p %1", disk)); +global string GetPartitionInfo (string disk) +{ + map outmap = (map) SCR::Execute (.target.bash_output, sformat("/sbin/fdasd -p '%1'", disk)); // if not an eckd-disk it's an fba-disk. fba-disks have only one partition if (outmap["exit"]:0 != 0) 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 Fri Feb 10 15:02:29 2012 @@ -13,7 +13,6 @@ module "ZFCPController"; textdomain "s390"; -import "Arch"; import "Mode"; import "Progress"; import "Report"; @@ -23,10 +22,8 @@ global map<integer,map<string,any> > devices = $[]; -global map<integer, boolean> selected = $[]; - global string filter_min = "0.0.0000"; - global string filter_max = "f.f.ffff"; + global string filter_max = "0.0.ffff"; global map<string, any> previous_settings = $[]; @@ -429,7 +426,7 @@ if (! activated_controllers[channel]:false) { string command = sformat ( - "/sbin/zfcp_host_configure %1 %2", + "/sbin/zfcp_host_configure '%1' '%2'", channel, 1 ); Modified: trunk/s390/src/zfcp/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/zfcp/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/zfcp/dialogs.ycp (original) +++ trunk/s390/src/zfcp/dialogs.ycp Fri Feb 10 15:02:29 2012 @@ -9,7 +9,6 @@ { textdomain "s390"; -import "Arch"; import "Label"; import "Mode"; import "Popup"; @@ -43,7 +42,6 @@ return ret ? `next : `abort; } - // ------------------------------------------------------------------------------------ /** * Get the list of items for the table of ZFCP devices @@ -64,10 +62,6 @@ string fcp_lun = d["detail", "fcp_lun"]:"unknown"; if (fcp_lun != "unknown") fcp_lun = ZFCPController::HexNumSize (fcp_lun, 16); - string selected = ZFCPController::selected[k]:false - // table cell - ? _("Yes") - : "-"; return `item(`id(k), channel, wwpn, fcp_lun); }); @@ -84,13 +78,13 @@ ZFCPController::filter_min = (string) UI::QueryWidget(`min_chan, `Value); ZFCPController::filter_max = (string) UI::QueryWidget(`max_chan, `Value); - ZFCPController::ProbeDisks (); + ZFCPController::ProbeDisks(); list<term> items = GetZFCPDiskItems(); UI::ChangeWidget(`id(`table), `Items, items); - UI::ChangeWidget (`id (`delete), `Enabled, size (items) > 0); - UI::SetFocus (`table); + UI::ChangeWidget(`id(`delete), `Enabled, !isempty(items)); + UI::SetFocus(`table); } /** @@ -371,7 +365,6 @@ } return (symbol) 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] r67411 - in /trunk/dns-server: package/yast2-dns-server.changes src/DnsServer.pm
by locilka＠svn2.opensuse.org 10 Feb '12

10 Feb '12

Author: locilka Date: Fri Feb 10 14:57:16 2012 New Revision: 67411 URL: http://svn.opensuse.org/viewcvs/yast?rev=67411&view=rev Log: - Fixed saving the current status of all zones to LDAP/files while switching from using files to LDAP and vice versa (bnc#746401). Modified: trunk/dns-server/package/yast2-dns-server.changes trunk/dns-server/src/DnsServer.pm Modified: trunk/dns-server/package/yast2-dns-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/package/yast2-dns-ser… ============================================================================== --- trunk/dns-server/package/yast2-dns-server.changes (original) +++ trunk/dns-server/package/yast2-dns-server.changes Fri Feb 10 14:57:16 2012 @@ -3,6 +3,8 @@ - Fixed transforming records from absolute to relative format while they are listed in UI (bnc#746363). +- Fixed saving the current status of all zones to LDAP/files while + switching from using files to LDAP and vice versa (bnc#746401). ------------------------------------------------------------------ Thu Feb 9 15:16:58 CET 2012 - locilka(a)suse.com Modified: trunk/dns-server/src/DnsServer.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/src/DnsServer.pm?rev=… ============================================================================== --- trunk/dns-server/src/DnsServer.pm (original) +++ trunk/dns-server/src/DnsServer.pm Fri Feb 10 14:57:16 2012 @@ -120,15 +120,21 @@ return 0; } - if (! ($zone_map{"modified"} || $save_all)) + if ($zone_name eq "localhost" || $zone_name eq "0.0.127.in-addr.arpa") { - y2milestone ("Skipping zone $zone_name, wasn't modified"); + y2milestone ("Skipping system zone $zone_name"); return 1; } - if ($zone_name eq "localhost" || $zone_name eq "0.0.127.in-addr.arpa") + if ($save_all) { + y2milestone ("Saving all zones, flagging ".$zone_name." zone as modified"); + $zone_map{"modified"} = 1; + } + + # zone not modified (it's not modified if the flag is not set) + if (! (defined $zone_map{"modified"} ? $zone_map{"modified"} : 0)) { - y2milestone ("Skipping system zone $zone_name"); + y2milestone ("Skipping zone $zone_name, wasn't modified"); return 1; } @@ -645,12 +651,20 @@ return $start_service; } +sub UseLdapModified { + my $self = shift; + + $self->SetModified (); + # Save all zones as they are into the new config location (LDAP/files) + $save_all = 1; +} + BEGIN { $TYPEINFO{SetUseLdap} = [ "function", "boolean", "boolean" ];} sub SetUseLdap { my $self = shift; - $use_ldap = shift; + my $new_use_ldap = shift; - if ($use_ldap) { + if ($new_use_ldap) { # trying init LDAP if use_ldap selected my $success = $self->LdapInit (1, 1); @@ -659,9 +673,10 @@ } } - $self->SetModified (); + $use_ldap = $new_use_ldap; + y2milestone ("Using LDAP set to: ".$use_ldap); - $save_all = 1; + $self->UseLdapModified(); return 1; } @@ -1674,7 +1689,8 @@ if ($ask_user_to_enable_ldap) { # yes-no popup $use_ldap = Popup->YesNo (__("Enable LDAP support?")); - y2milestone ("User choose to use LDAP: $use_ldap"); + $self->UseLdapModified(); + y2milestone ("User chose to use LDAP: $use_ldap"); # just disable LDAP } else { $use_ldap = 0; -- 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] r67410 - in /branches/SuSE-Code-11-SP2-Branch/dns-server: package/yast2-dns-server.changes src/DnsServer.pm
by locilka＠svn2.opensuse.org 10 Feb '12

10 Feb '12

Author: locilka Date: Fri Feb 10 14:57:05 2012 New Revision: 67410 URL: http://svn.opensuse.org/viewcvs/yast?rev=67410&view=rev Log: - Fixed saving the current status of all zones to LDAP/files while switching from using files to LDAP and vice versa (bnc#746401). Modified: branches/SuSE-Code-11-SP2-Branch/dns-server/package/yast2-dns-server.changes branches/SuSE-Code-11-SP2-Branch/dns-server/src/DnsServer.pm Modified: branches/SuSE-Code-11-SP2-Branch/dns-server/package/yast2-dns-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/dns-server/package/yast2-dns-server.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/dns-server/package/yast2-dns-server.changes Fri Feb 10 14:57:05 2012 @@ -3,6 +3,8 @@ - Fixed transforming records from absolute to relative format while they are listed in UI (bnc#746363). +- Fixed saving the current status of all zones to LDAP/files while + switching from using files to LDAP and vice versa (bnc#746401). ------------------------------------------------------------------ Thu Feb 9 15:16:58 CET 2012 - locilka(a)suse.com Modified: branches/SuSE-Code-11-SP2-Branch/dns-server/src/DnsServer.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/dns-server/src/DnsServer.pm (original) +++ branches/SuSE-Code-11-SP2-Branch/dns-server/src/DnsServer.pm Fri Feb 10 14:57:05 2012 @@ -120,15 +120,21 @@ return 0; } - if (! ($zone_map{"modified"} || $save_all)) + if ($zone_name eq "localhost" || $zone_name eq "0.0.127.in-addr.arpa") { - y2milestone ("Skipping zone $zone_name, wasn't modified"); + y2milestone ("Skipping system zone $zone_name"); return 1; } - if ($zone_name eq "localhost" || $zone_name eq "0.0.127.in-addr.arpa") + if ($save_all) { + y2milestone ("Saving all zones, flagging ".$zone_name." zone as modified"); + $zone_map{"modified"} = 1; + } + + # zone not modified (it's not modified if the flag is not set) + if (! (defined $zone_map{"modified"} ? $zone_map{"modified"} : 0)) { - y2milestone ("Skipping system zone $zone_name"); + y2milestone ("Skipping zone $zone_name, wasn't modified"); return 1; } @@ -645,12 +651,20 @@ return $start_service; } +sub UseLdapModified { + my $self = shift; + + $self->SetModified (); + # Save all zones as they are into the new config location (LDAP/files) + $save_all = 1; +} + BEGIN { $TYPEINFO{SetUseLdap} = [ "function", "boolean", "boolean" ];} sub SetUseLdap { my $self = shift; - $use_ldap = shift; + my $new_use_ldap = shift; - if ($use_ldap) { + if ($new_use_ldap) { # trying init LDAP if use_ldap selected my $success = $self->LdapInit (1, 1); @@ -659,9 +673,10 @@ } } - $self->SetModified (); + $use_ldap = $new_use_ldap; + y2milestone ("Using LDAP set to: ".$use_ldap); - $save_all = 1; + $self->UseLdapModified(); return 1; } @@ -1674,7 +1689,8 @@ if ($ask_user_to_enable_ldap) { # yes-no popup $use_ldap = Popup->YesNo (__("Enable LDAP support?")); - y2milestone ("User choose to use LDAP: $use_ldap"); + $self->UseLdapModified(); + y2milestone ("User chose to use LDAP: $use_ldap"); # just disable LDAP } else { $use_ldap = 0; -- 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] r67409 - in /branches/SuSE-Code-11-SP1-Branch/dns-server: package/yast2-dns-server.changes src/DnsServer.pm
by locilka＠svn2.opensuse.org 10 Feb '12

10 Feb '12

Author: locilka Date: Fri Feb 10 14:56:54 2012 New Revision: 67409 URL: http://svn.opensuse.org/viewcvs/yast?rev=67409&view=rev Log: - Fixed saving the current status of all zones to LDAP/files while switching from using files to LDAP and vice versa (bnc#746401). Modified: branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes branches/SuSE-Code-11-SP1-Branch/dns-server/src/DnsServer.pm Modified: branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes Fri Feb 10 14:56:54 2012 @@ -3,6 +3,8 @@ - Fixed transforming records from absolute to relative format while they are listed in UI (bnc#746363). +- Fixed saving the current status of all zones to LDAP/files while + switching from using files to LDAP and vice versa (bnc#746401). ------------------------------------------------------------------ Thu Feb 9 15:16:58 CET 2012 - locilka(a)suse.com Modified: branches/SuSE-Code-11-SP1-Branch/dns-server/src/DnsServer.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/dns-server/src/DnsServer.pm (original) +++ branches/SuSE-Code-11-SP1-Branch/dns-server/src/DnsServer.pm Fri Feb 10 14:56:54 2012 @@ -120,15 +120,21 @@ return 0; } - if (! ($zone_map{"modified"} || $save_all)) + if ($zone_name eq "localhost" || $zone_name eq "0.0.127.in-addr.arpa") { - y2milestone ("Skipping zone $zone_name, wasn't modified"); + y2milestone ("Skipping system zone $zone_name"); return 1; } - if ($zone_name eq "localhost" || $zone_name eq "0.0.127.in-addr.arpa") + if ($save_all) { + y2milestone ("Saving all zones, flagging ".$zone_name." zone as modified"); + $zone_map{"modified"} = 1; + } + + # zone not modified (it's not modified if the flag is not set) + if (! (defined $zone_map{"modified"} ? $zone_map{"modified"} : 0)) { - y2milestone ("Skipping system zone $zone_name"); + y2milestone ("Skipping zone $zone_name, wasn't modified"); return 1; } @@ -645,12 +651,20 @@ return $start_service; } +sub UseLdapModified { + my $self = shift; + + $self->SetModified (); + # Save all zones as they are into the new config location (LDAP/files) + $save_all = 1; +} + BEGIN { $TYPEINFO{SetUseLdap} = [ "function", "boolean", "boolean" ];} sub SetUseLdap { my $self = shift; - $use_ldap = shift; + my $new_use_ldap = shift; - if ($use_ldap) { + if ($new_use_ldap) { # trying init LDAP if use_ldap selected my $success = $self->LdapInit (1, 1); @@ -659,9 +673,10 @@ } } - $self->SetModified (); + $use_ldap = $new_use_ldap; + y2milestone ("Using LDAP set to: ".$use_ldap); - $save_all = 1; + $self->UseLdapModified(); return 1; } @@ -1674,7 +1689,8 @@ if ($ask_user_to_enable_ldap) { # yes-no popup $use_ldap = Popup->YesNo (__("Enable LDAP support?")); - y2milestone ("User choose to use LDAP: $use_ldap"); + $self->UseLdapModified(); + y2milestone ("User chose to use LDAP: $use_ldap"); # just disable LDAP } else { $use_ldap = 0; -- 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] r67408 - in /trunk/dns-server: package/ src/ testsuite/tests/
by locilka＠svn2.opensuse.org 10 Feb '12

10 Feb '12

Author: locilka Date: Fri Feb 10 13:27:51 2012 New Revision: 67408 URL: http://svn.opensuse.org/viewcvs/yast?rev=67408&view=rev Log: - Fixed transforming records from absolute to relative format while they are listed in UI (bnc#746363). Added: trunk/dns-server/testsuite/tests/DnsServerHelperFunctions.err trunk/dns-server/testsuite/tests/DnsServerHelperFunctions.out trunk/dns-server/testsuite/tests/DnsServerHelperFunctions.ycp Modified: trunk/dns-server/package/yast2-dns-server.changes trunk/dns-server/src/DnsServerHelperFunctions.ycp trunk/dns-server/src/dialog-masterzone.ycp Modified: trunk/dns-server/package/yast2-dns-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/package/yast2-dns-ser… ============================================================================== --- trunk/dns-server/package/yast2-dns-server.changes (original) +++ trunk/dns-server/package/yast2-dns-server.changes Fri Feb 10 13:27:51 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------ +Fri Feb 10 13:13:43 CET 2012 - locilka(a)suse.com + +- Fixed transforming records from absolute to relative format + while they are listed in UI (bnc#746363). + +------------------------------------------------------------------ Thu Feb 9 15:16:58 CET 2012 - locilka(a)suse.com - Fixed transforming records from relative to absolute format. Modified: trunk/dns-server/src/DnsServerHelperFunctions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/src/DnsServerHelperFu… ============================================================================== --- trunk/dns-server/src/DnsServerHelperFunctions.ycp (original) +++ trunk/dns-server/src/DnsServerHelperFunctions.ycp Fri Feb 10 13:27:51 2012 @@ -216,5 +216,39 @@ DnsServer::StoreZone (); } +map <string, list <string> > skip_converting_to_relative = $[ + "key" : [ + ], + "value" : [ + "TXT", "SPF", "SRV" + ] +]; + +global string RRToRelativeName (string absolute_name, string zone_name, string record_type, string key_or_value) { + if (absolute_name == nil || zone_name == nil) { + y2error ("Erroneous record: %1/%2/%3/%4", absolute_name, zone_name, record_type, key_or_value); + return nil; + } + + if (key_or_value != "key" && key_or_value != "value") { + y2error ("Unknown key/value %1", key_or_value); + return absolute_name; + } + + // these records are not wanted to be converted to a relative name + if (contains (skip_converting_to_relative[key_or_value]:[], toupper(record_type))) { + y2debug ("Not converting %1/%2", key_or_value, record_type); + return absolute_name; + } + + string remove_this_to_be_relative = "\\." + zone_name + "\\.$"; + string relative_name = regexpsub (absolute_name, "([^ \t]*)" + remove_this_to_be_relative, "\\1"); + if (relative_name != nil) { + return relative_name; + } + + return absolute_name; +} + /* EOF */ } Modified: trunk/dns-server/src/dialog-masterzone.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/src/dialog-masterzone… ============================================================================== --- trunk/dns-server/src/dialog-masterzone.ycp (original) +++ trunk/dns-server/src/dialog-masterzone.ycp Fri Feb 10 13:27:51 2012 @@ -32,20 +32,6 @@ include "dns-server/misc.ycp"; -string ToRelativeName (string absolute_name, string zone_name) { - if (absolute_name == nil || zone_name == nil) { - return nil; - } - - string remove_this_to_be_relative = "." + zone_name + "."; - string relative_name = regexpsub(absolute_name, "(.*)" + remove_this_to_be_relative, "\\1"); - if ((relative_name != nil) && (! regexpmatch(relative_name, "\\."))) { - return relative_name; - } - - return absolute_name; -} - // zone ACL --> list <string> available_zones_to_connect = []; @@ -1198,14 +1184,14 @@ // Applies to all UI::ChangeWidget (`id ("add_record_name"), `Value, - ToRelativeName( - Punycode::DecodeDomainName (current_key), decoded_zone_name + DnsServerHelperFunctions::RRToRelativeName( + Punycode::DecodeDomainName (current_key), decoded_zone_name, current_type, "key" ) ); UI::ChangeWidget (`id ("add_record_type"), `Value, current_type); UI::ChangeWidget (`id ("add_record_val"), `Value, - ToRelativeName( - Punycode::DecodeDomainName (current_val), decoded_zone_name + DnsServerHelperFunctions::RRToRelativeName( + Punycode::DecodeDomainName (current_val), decoded_zone_name, current_type, "value" ) ); } @@ -1252,11 +1238,17 @@ list items = maplist (integer r, ret, { counter = counter + 1; + string record_type = current_zone["records", r, "type"]:""; + return `item ( `id (r), - ToRelativeName (decoded_names[counter]:current_zone["records", r, "key"]:"", decoded_zone_name), - current_zone["records", r, "type"]:"", - ToRelativeName (decoded_names[counter+const_plus]:current_zone["records", r, "value"]:"", decoded_zone_name) + DnsServerHelperFunctions::RRToRelativeName ( + decoded_names[counter]:current_zone["records", r, "key"]:"", decoded_zone_name, record_type, "key" + ), + record_type, + DnsServerHelperFunctions::RRToRelativeName ( + decoded_names[counter+const_plus]:current_zone["records", r, "value"]:"", decoded_zone_name, record_type, "value" + ) ); }); Added: trunk/dns-server/testsuite/tests/DnsServerHelperFunctions.err URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/testsuite/tests/DnsSe… ============================================================================== (empty) Added: trunk/dns-server/testsuite/tests/DnsServerHelperFunctions.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/testsuite/tests/DnsSe… ============================================================================== --- trunk/dns-server/testsuite/tests/DnsServerHelperFunctions.out (added) +++ trunk/dns-server/testsuite/tests/DnsServerHelperFunctions.out Fri Feb 10 13:27:51 2012 @@ -0,0 +1,12 @@ +Dump ========================================================== +Return dhcp1 +Return relative-name-1 +Return relative-name-2 +Return dhcp1.subdomain +Return dhcp1.different-example.com. +Return v=spf1 include:example.com -all +Return some-text +Return v=spf1 include:example.com -all +Return _http._tcp +Return 0 5 80 example.com. +Dump ========================================================== Added: trunk/dns-server/testsuite/tests/DnsServerHelperFunctions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/dns-server/testsuite/tests/DnsSe… ============================================================================== --- trunk/dns-server/testsuite/tests/DnsServerHelperFunctions.ycp (added) +++ trunk/dns-server/testsuite/tests/DnsServerHelperFunctions.ycp Fri Feb 10 13:27:51 2012 @@ -0,0 +1,113 @@ +/** + * File: DnsServerHelperFunctions.ycp + * Package: Configuration of dns-server + * Summary: Testsuite helper module + * Authors: Lukas Ocilka <locilka(a)suse.com> + * Copyright: Copyright 2012, Novell, Inc. All rights reserved. + * + * $Id$ + * + * Testsuite for helper functions module + */ + +{ + include "testsuite.ycp"; + // testedfiles: DnsServerHelperFunctions.ycp + + map READ = $[]; + map WRITE = $[]; + map EXEC = $[]; + + TESTSUITE_INIT ([READ, WRITE, EXEC], nil); + + import "DnsServerHelperFunctions"; + import "Mode"; + + Mode::SetMode("test"); + + string zone = "example.com"; + + DUMP ("=========================================================="); + + // cuts the zone name off + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "dhcp1." + zone + ".", + zone, + "A", + "key" + )), [READ, WRITE, EXEC], nil); + + // CNAME - key can be relative + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "relative-name-1." + zone + ".", + zone, + "cname", + "key" + )), [READ, WRITE, EXEC], nil); + + // CNAME - value can be relative + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "relative-name-2." + zone + ".", + zone, + "cname", + "value" + )), [READ, WRITE, EXEC], nil); + + // cuts the zone name off (leaves subdomain) + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "dhcp1.subdomain." + zone + ".", + zone, + "A", + "key" + )), [READ, WRITE, EXEC], nil); + + // different zone name + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "dhcp1.different-" + zone + ".", + zone, + "A", + "key" + )), [READ, WRITE, EXEC], nil); + + // TXT record (value), not changed + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "v=spf1 include:" + zone + " -all", + zone, + "TXT", + "value" + )), [READ, WRITE, EXEC], nil); + + // TXT record (key), can be realtive + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "some-text." + zone + ".", + zone, + "TXT", + "key" + )), [READ, WRITE, EXEC], nil); + + // SPF record (value), not changed + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "v=spf1 include:" + zone + " -all", + zone, + "SPF", + "value" + )), [READ, WRITE, EXEC], nil); + + // SRV record (key) can be realtive + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "_http._tcp." + zone + ".", + zone, + "SRV", + "key" + )), [READ, WRITE, EXEC], nil); + + // SRV record (value) can't be realtive + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "0 5 80 " + zone + ".", + zone, + "SRV", + "value" + )), [READ, WRITE, EXEC], nil); + + DUMP ("=========================================================="); +} -- 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] r67407 - in /branches/SuSE-Code-11-SP2-Branch/dns-server: package/ src/ testsuite/tests/
by locilka＠svn2.opensuse.org 10 Feb '12

10 Feb '12

Author: locilka Date: Fri Feb 10 13:27:40 2012 New Revision: 67407 URL: http://svn.opensuse.org/viewcvs/yast?rev=67407&view=rev Log: - Fixed transforming records from absolute to relative format while they are listed in UI (bnc#746363). Added: branches/SuSE-Code-11-SP2-Branch/dns-server/testsuite/tests/DnsServerHelperFunctions.err branches/SuSE-Code-11-SP2-Branch/dns-server/testsuite/tests/DnsServerHelperFunctions.out branches/SuSE-Code-11-SP2-Branch/dns-server/testsuite/tests/DnsServerHelperFunctions.ycp Modified: branches/SuSE-Code-11-SP2-Branch/dns-server/package/yast2-dns-server.changes branches/SuSE-Code-11-SP2-Branch/dns-server/src/DnsServerHelperFunctions.ycp branches/SuSE-Code-11-SP2-Branch/dns-server/src/dialog-masterzone.ycp Modified: branches/SuSE-Code-11-SP2-Branch/dns-server/package/yast2-dns-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/dns-server/package/yast2-dns-server.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/dns-server/package/yast2-dns-server.changes Fri Feb 10 13:27:40 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------ +Fri Feb 10 13:13:43 CET 2012 - locilka(a)suse.com + +- Fixed transforming records from absolute to relative format + while they are listed in UI (bnc#746363). + +------------------------------------------------------------------ Thu Feb 9 15:16:58 CET 2012 - locilka(a)suse.com - Fixed transforming records from relative to absolute format. Modified: branches/SuSE-Code-11-SP2-Branch/dns-server/src/DnsServerHelperFunctions.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/dns-server/src/DnsServerHelperFunctions.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/dns-server/src/DnsServerHelperFunctions.ycp Fri Feb 10 13:27:40 2012 @@ -216,5 +216,39 @@ DnsServer::StoreZone (); } +map <string, list <string> > skip_converting_to_relative = $[ + "key" : [ + ], + "value" : [ + "TXT", "SPF", "SRV" + ] +]; + +global string RRToRelativeName (string absolute_name, string zone_name, string record_type, string key_or_value) { + if (absolute_name == nil || zone_name == nil) { + y2error ("Erroneous record: %1/%2/%3/%4", absolute_name, zone_name, record_type, key_or_value); + return nil; + } + + if (key_or_value != "key" && key_or_value != "value") { + y2error ("Unknown key/value %1", key_or_value); + return absolute_name; + } + + // these records are not wanted to be converted to a relative name + if (contains (skip_converting_to_relative[key_or_value]:[], toupper(record_type))) { + y2debug ("Not converting %1/%2", key_or_value, record_type); + return absolute_name; + } + + string remove_this_to_be_relative = "\\." + zone_name + "\\.$"; + string relative_name = regexpsub (absolute_name, "([^ \t]*)" + remove_this_to_be_relative, "\\1"); + if (relative_name != nil) { + return relative_name; + } + + return absolute_name; +} + /* EOF */ } Modified: branches/SuSE-Code-11-SP2-Branch/dns-server/src/dialog-masterzone.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/dns-server/src/dialog-masterzone.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/dns-server/src/dialog-masterzone.ycp Fri Feb 10 13:27:40 2012 @@ -32,20 +32,6 @@ include "dns-server/misc.ycp"; -string ToRelativeName (string absolute_name, string zone_name) { - if (absolute_name == nil || zone_name == nil) { - return nil; - } - - string remove_this_to_be_relative = "." + zone_name + "."; - string relative_name = regexpsub(absolute_name, "(.*)" + remove_this_to_be_relative, "\\1"); - if ((relative_name != nil) && (! regexpmatch(relative_name, "\\."))) { - return relative_name; - } - - return absolute_name; -} - // zone ACL --> list <string> available_zones_to_connect = []; @@ -1198,14 +1184,14 @@ // Applies to all UI::ChangeWidget (`id ("add_record_name"), `Value, - ToRelativeName( - Punycode::DecodeDomainName (current_key), decoded_zone_name + DnsServerHelperFunctions::RRToRelativeName( + Punycode::DecodeDomainName (current_key), decoded_zone_name, current_type, "key" ) ); UI::ChangeWidget (`id ("add_record_type"), `Value, current_type); UI::ChangeWidget (`id ("add_record_val"), `Value, - ToRelativeName( - Punycode::DecodeDomainName (current_val), decoded_zone_name + DnsServerHelperFunctions::RRToRelativeName( + Punycode::DecodeDomainName (current_val), decoded_zone_name, current_type, "value" ) ); } @@ -1252,11 +1238,17 @@ list items = maplist (integer r, ret, { counter = counter + 1; + string record_type = current_zone["records", r, "type"]:""; + return `item ( `id (r), - ToRelativeName (decoded_names[counter]:current_zone["records", r, "key"]:"", decoded_zone_name), - current_zone["records", r, "type"]:"", - ToRelativeName (decoded_names[counter+const_plus]:current_zone["records", r, "value"]:"", decoded_zone_name) + DnsServerHelperFunctions::RRToRelativeName ( + decoded_names[counter]:current_zone["records", r, "key"]:"", decoded_zone_name, record_type, "key" + ), + record_type, + DnsServerHelperFunctions::RRToRelativeName ( + decoded_names[counter+const_plus]:current_zone["records", r, "value"]:"", decoded_zone_name, record_type, "value" + ) ); }); Added: branches/SuSE-Code-11-SP2-Branch/dns-server/testsuite/tests/DnsServerHelperFunctions.err URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/dns-s… ============================================================================== (empty) Added: branches/SuSE-Code-11-SP2-Branch/dns-server/testsuite/tests/DnsServerHelperFunctions.out URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/dns-server/testsuite/tests/DnsServerHelperFunctions.out (added) +++ branches/SuSE-Code-11-SP2-Branch/dns-server/testsuite/tests/DnsServerHelperFunctions.out Fri Feb 10 13:27:40 2012 @@ -0,0 +1,12 @@ +Dump ========================================================== +Return dhcp1 +Return relative-name-1 +Return relative-name-2 +Return dhcp1.subdomain +Return dhcp1.different-example.com. +Return v=spf1 include:example.com -all +Return some-text +Return v=spf1 include:example.com -all +Return _http._tcp +Return 0 5 80 example.com. +Dump ========================================================== Added: branches/SuSE-Code-11-SP2-Branch/dns-server/testsuite/tests/DnsServerHelperFunctions.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/dns-server/testsuite/tests/DnsServerHelperFunctions.ycp (added) +++ branches/SuSE-Code-11-SP2-Branch/dns-server/testsuite/tests/DnsServerHelperFunctions.ycp Fri Feb 10 13:27:40 2012 @@ -0,0 +1,113 @@ +/** + * File: DnsServerHelperFunctions.ycp + * Package: Configuration of dns-server + * Summary: Testsuite helper module + * Authors: Lukas Ocilka <locilka(a)suse.com> + * Copyright: Copyright 2012, Novell, Inc. All rights reserved. + * + * $Id$ + * + * Testsuite for helper functions module + */ + +{ + include "testsuite.ycp"; + // testedfiles: DnsServerHelperFunctions.ycp + + map READ = $[]; + map WRITE = $[]; + map EXEC = $[]; + + TESTSUITE_INIT ([READ, WRITE, EXEC], nil); + + import "DnsServerHelperFunctions"; + import "Mode"; + + Mode::SetMode("test"); + + string zone = "example.com"; + + DUMP ("=========================================================="); + + // cuts the zone name off + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "dhcp1." + zone + ".", + zone, + "A", + "key" + )), [READ, WRITE, EXEC], nil); + + // CNAME - key can be relative + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "relative-name-1." + zone + ".", + zone, + "cname", + "key" + )), [READ, WRITE, EXEC], nil); + + // CNAME - value can be relative + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "relative-name-2." + zone + ".", + zone, + "cname", + "value" + )), [READ, WRITE, EXEC], nil); + + // cuts the zone name off (leaves subdomain) + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "dhcp1.subdomain." + zone + ".", + zone, + "A", + "key" + )), [READ, WRITE, EXEC], nil); + + // different zone name + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "dhcp1.different-" + zone + ".", + zone, + "A", + "key" + )), [READ, WRITE, EXEC], nil); + + // TXT record (value), not changed + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "v=spf1 include:" + zone + " -all", + zone, + "TXT", + "value" + )), [READ, WRITE, EXEC], nil); + + // TXT record (key), can be realtive + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "some-text." + zone + ".", + zone, + "TXT", + "key" + )), [READ, WRITE, EXEC], nil); + + // SPF record (value), not changed + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "v=spf1 include:" + zone + " -all", + zone, + "SPF", + "value" + )), [READ, WRITE, EXEC], nil); + + // SRV record (key) can be realtive + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "_http._tcp." + zone + ".", + zone, + "SRV", + "key" + )), [READ, WRITE, EXEC], nil); + + // SRV record (value) can't be realtive + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "0 5 80 " + zone + ".", + zone, + "SRV", + "value" + )), [READ, WRITE, EXEC], nil); + + DUMP ("=========================================================="); +} -- 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] r67406 - in /branches/SuSE-Code-11-SP1-Branch/dns-server: package/ src/ testsuite/tests/
by locilka＠svn2.opensuse.org 10 Feb '12

10 Feb '12

Author: locilka Date: Fri Feb 10 13:27:24 2012 New Revision: 67406 URL: http://svn.opensuse.org/viewcvs/yast?rev=67406&view=rev Log: - Fixed transforming records from absolute to relative format while they are listed in UI (bnc#746363). Added: branches/SuSE-Code-11-SP1-Branch/dns-server/testsuite/tests/DnsServerHelperFunctions.err branches/SuSE-Code-11-SP1-Branch/dns-server/testsuite/tests/DnsServerHelperFunctions.out branches/SuSE-Code-11-SP1-Branch/dns-server/testsuite/tests/DnsServerHelperFunctions.ycp Modified: branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes branches/SuSE-Code-11-SP1-Branch/dns-server/src/DnsServerHelperFunctions.ycp branches/SuSE-Code-11-SP1-Branch/dns-server/src/dialog-masterzone.ycp Modified: branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/dns-server/package/yast2-dns-server.changes Fri Feb 10 13:27:24 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------ +Fri Feb 10 13:13:43 CET 2012 - locilka(a)suse.com + +- Fixed transforming records from absolute to relative format + while they are listed in UI (bnc#746363). + +------------------------------------------------------------------ Thu Feb 9 15:16:58 CET 2012 - locilka(a)suse.com - Fixed transforming records from relative to absolute format. Modified: branches/SuSE-Code-11-SP1-Branch/dns-server/src/DnsServerHelperFunctions.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/dns-server/src/DnsServerHelperFunctions.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/dns-server/src/DnsServerHelperFunctions.ycp Fri Feb 10 13:27:24 2012 @@ -216,5 +216,39 @@ DnsServer::StoreZone (); } +map <string, list <string> > skip_converting_to_relative = $[ + "key" : [ + ], + "value" : [ + "TXT", "SPF", "SRV" + ] +]; + +global string RRToRelativeName (string absolute_name, string zone_name, string record_type, string key_or_value) { + if (absolute_name == nil || zone_name == nil) { + y2error ("Erroneous record: %1/%2/%3/%4", absolute_name, zone_name, record_type, key_or_value); + return nil; + } + + if (key_or_value != "key" && key_or_value != "value") { + y2error ("Unknown key/value %1", key_or_value); + return absolute_name; + } + + // these records are not wanted to be converted to a relative name + if (contains (skip_converting_to_relative[key_or_value]:[], toupper(record_type))) { + y2debug ("Not converting %1/%2", key_or_value, record_type); + return absolute_name; + } + + string remove_this_to_be_relative = "\\." + zone_name + "\\.$"; + string relative_name = regexpsub (absolute_name, "([^ \t]*)" + remove_this_to_be_relative, "\\1"); + if (relative_name != nil) { + return relative_name; + } + + return absolute_name; +} + /* EOF */ } Modified: branches/SuSE-Code-11-SP1-Branch/dns-server/src/dialog-masterzone.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/dns-server/src/dialog-masterzone.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/dns-server/src/dialog-masterzone.ycp Fri Feb 10 13:27:24 2012 @@ -32,20 +32,6 @@ include "dns-server/misc.ycp"; -string ToRelativeName (string absolute_name, string zone_name) { - if (absolute_name == nil || zone_name == nil) { - return nil; - } - - string remove_this_to_be_relative = "." + zone_name + "."; - string relative_name = regexpsub(absolute_name, "(.*)" + remove_this_to_be_relative, "\\1"); - if ((relative_name != nil) && (! regexpmatch(relative_name, "\\."))) { - return relative_name; - } - - return absolute_name; -} - // zone ACL --> list <string> available_zones_to_connect = []; @@ -1198,14 +1184,14 @@ // Applies to all UI::ChangeWidget (`id ("add_record_name"), `Value, - ToRelativeName( - Punycode::DecodeDomainName (current_key), decoded_zone_name + DnsServerHelperFunctions::RRToRelativeName( + Punycode::DecodeDomainName (current_key), decoded_zone_name, current_type, "key" ) ); UI::ChangeWidget (`id ("add_record_type"), `Value, current_type); UI::ChangeWidget (`id ("add_record_val"), `Value, - ToRelativeName( - Punycode::DecodeDomainName (current_val), decoded_zone_name + DnsServerHelperFunctions::RRToRelativeName( + Punycode::DecodeDomainName (current_val), decoded_zone_name, current_type, "value" ) ); } @@ -1252,11 +1238,17 @@ list items = maplist (integer r, ret, { counter = counter + 1; + string record_type = current_zone["records", r, "type"]:""; + return `item ( `id (r), - ToRelativeName (decoded_names[counter]:current_zone["records", r, "key"]:"", decoded_zone_name), - current_zone["records", r, "type"]:"", - ToRelativeName (decoded_names[counter+const_plus]:current_zone["records", r, "value"]:"", decoded_zone_name) + DnsServerHelperFunctions::RRToRelativeName ( + decoded_names[counter]:current_zone["records", r, "key"]:"", decoded_zone_name, record_type, "key" + ), + record_type, + DnsServerHelperFunctions::RRToRelativeName ( + decoded_names[counter+const_plus]:current_zone["records", r, "value"]:"", decoded_zone_name, record_type, "value" + ) ); }); Added: branches/SuSE-Code-11-SP1-Branch/dns-server/testsuite/tests/DnsServerHelperFunctions.err URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/dns-s… ============================================================================== (empty) Added: branches/SuSE-Code-11-SP1-Branch/dns-server/testsuite/tests/DnsServerHelperFunctions.out URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/dns-server/testsuite/tests/DnsServerHelperFunctions.out (added) +++ branches/SuSE-Code-11-SP1-Branch/dns-server/testsuite/tests/DnsServerHelperFunctions.out Fri Feb 10 13:27:24 2012 @@ -0,0 +1,12 @@ +Dump ========================================================== +Return dhcp1 +Return relative-name-1 +Return relative-name-2 +Return dhcp1.subdomain +Return dhcp1.different-example.com. +Return v=spf1 include:example.com -all +Return some-text +Return v=spf1 include:example.com -all +Return _http._tcp +Return 0 5 80 example.com. +Dump ========================================================== Added: branches/SuSE-Code-11-SP1-Branch/dns-server/testsuite/tests/DnsServerHelperFunctions.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/dns-s… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/dns-server/testsuite/tests/DnsServerHelperFunctions.ycp (added) +++ branches/SuSE-Code-11-SP1-Branch/dns-server/testsuite/tests/DnsServerHelperFunctions.ycp Fri Feb 10 13:27:24 2012 @@ -0,0 +1,113 @@ +/** + * File: DnsServerHelperFunctions.ycp + * Package: Configuration of dns-server + * Summary: Testsuite helper module + * Authors: Lukas Ocilka <locilka(a)suse.com> + * Copyright: Copyright 2012, Novell, Inc. All rights reserved. + * + * $Id$ + * + * Testsuite for helper functions module + */ + +{ + include "testsuite.ycp"; + // testedfiles: DnsServerHelperFunctions.ycp + + map READ = $[]; + map WRITE = $[]; + map EXEC = $[]; + + TESTSUITE_INIT ([READ, WRITE, EXEC], nil); + + import "DnsServerHelperFunctions"; + import "Mode"; + + Mode::SetMode("test"); + + string zone = "example.com"; + + DUMP ("=========================================================="); + + // cuts the zone name off + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "dhcp1." + zone + ".", + zone, + "A", + "key" + )), [READ, WRITE, EXEC], nil); + + // CNAME - key can be relative + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "relative-name-1." + zone + ".", + zone, + "cname", + "key" + )), [READ, WRITE, EXEC], nil); + + // CNAME - value can be relative + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "relative-name-2." + zone + ".", + zone, + "cname", + "value" + )), [READ, WRITE, EXEC], nil); + + // cuts the zone name off (leaves subdomain) + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "dhcp1.subdomain." + zone + ".", + zone, + "A", + "key" + )), [READ, WRITE, EXEC], nil); + + // different zone name + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "dhcp1.different-" + zone + ".", + zone, + "A", + "key" + )), [READ, WRITE, EXEC], nil); + + // TXT record (value), not changed + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "v=spf1 include:" + zone + " -all", + zone, + "TXT", + "value" + )), [READ, WRITE, EXEC], nil); + + // TXT record (key), can be realtive + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "some-text." + zone + ".", + zone, + "TXT", + "key" + )), [READ, WRITE, EXEC], nil); + + // SPF record (value), not changed + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "v=spf1 include:" + zone + " -all", + zone, + "SPF", + "value" + )), [READ, WRITE, EXEC], nil); + + // SRV record (key) can be realtive + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "_http._tcp." + zone + ".", + zone, + "SRV", + "key" + )), [READ, WRITE, EXEC], nil); + + // SRV record (value) can't be realtive + TEST (``(DnsServerHelperFunctions::RRToRelativeName ( + "0 5 80 " + zone + ".", + zone, + "SRV", + "value" + )), [READ, WRITE, EXEC], nil); + + DUMP ("=========================================================="); +} -- 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] r67405 - in /trunk/s390/src: dasd/dialogs.ycp modules/DASDController.ycp modules/ZFCPController.ycp
by aschnell＠svn2.opensuse.org 10 Feb '12

10 Feb '12

Author: aschnell Date: Fri Feb 10 12:15:08 2012 New Revision: 67405 URL: http://svn.opensuse.org/viewcvs/yast?rev=67405&view=rev Log: - use new String::YesNo Modified: trunk/s390/src/dasd/dialogs.ycp trunk/s390/src/modules/DASDController.ycp trunk/s390/src/modules/ZFCPController.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 Fri Feb 10 12:15:08 2012 @@ -18,6 +18,7 @@ import "Report"; import "Sequencer"; import "Wizard"; + import "String"; include "s390/dasd/helps.ycp"; @@ -82,17 +83,9 @@ { items = maplist (integer k, map<string,any> d, devices, { string channel = d["channel_id"]:""; - string diag = d["diag"]:false - // table cell - ? _("Yes") - // table cell - : _("No"); - string format = d["format"]:false - // table cell - ? _("Yes") - // table cell - : _("No"); - return `item (`id(k), channel, format, diag); + string diag = String::YesNo(d["diag"]:false); + string format = String::YesNo(d["format"]:false); + return `item(`id(k), channel, format, diag); }); } else @@ -102,11 +95,7 @@ integer channel = d["resource", "io", 0, "start"]:0; string str_channel = d["channel"]:""; string access = toupper(d["resource", "io", 0, "mode"]:"RO"); - string diag = DASDController::diag[str_channel]:false - // table cell - ? _("Yes") - // table cell - : _("No"); + string diag = String::YesNo(DASDController::diag[str_channel]:false); string device = d["dev_name"]:""; string type = toupper(sformat("%1/%2, %3/%4", substring(tohexstring(d["device_id"]:0 & 0xffff, 4), 2), @@ -115,11 +104,7 @@ substring(tohexstring(d["detail", "dev_model"]:0, 4), 4) )); - string formatted = d["formatted"]:false - // table cell - ? _("Yes") - // table cell - : _("No"); + string formatted = String::YesNo(d["formatted"]:false); string partition_info = d["partition_info"]:"--"; string selected = DASDController::selected[k]:false 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 Fri Feb 10 12:15:08 2012 @@ -9,9 +9,7 @@ * Representation of the configuration of controller. * Input and output routines. */ - { - module "DASDController"; textdomain "s390"; @@ -283,9 +281,7 @@ // 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"]:"", - d["format"]:false ? _("Yes") : _("No"), - d["diag"]:false ? _("Yes") : _("No") + d["channel"]:"", String::YesNo(d["format"]:false), String::YesNo(d["diag"]:false) ); return s; }); @@ -695,5 +691,4 @@ return mergestring (l, ", "); } -/* EOF */ } 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 Fri Feb 10 12:15:08 2012 @@ -9,9 +9,7 @@ * Representation of the configuration of controller. * Input and output routines. */ - { - module "ZFCPController"; textdomain "s390"; @@ -503,7 +501,4 @@ return runCommand(sformat("zfcp_san_disc -b '%1' -p '%2' -L", busid, wwpn)); } - - -/* EOF */ } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67404 - /trunk/yast2/library/types/src/String.ycp
by aschnell＠svn2.opensuse.org 10 Feb '12

10 Feb '12

Author: aschnell Date: Fri Feb 10 12:12:06 2012 New Revision: 67404 URL: http://svn.opensuse.org/viewcvs/yast?rev=67404&view=rev Log: - added String::YesNo Modified: trunk/yast2/library/types/src/String.ycp Modified: trunk/yast2/library/types/src/String.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/types/src/String.y… ============================================================================== --- trunk/yast2/library/types/src/String.ycp (original) +++ trunk/yast2/library/types/src/String.ycp Fri Feb 10 12:12:06 2012 @@ -75,6 +75,26 @@ return NonEmpty (splitstring (s, "\n")); } + +/** + * @param value boolean + * @return boolean value as "Yes" or "No" + */ +global string YesNo(boolean value) +{ + if (value) + { + // human text for Boolean value + return _("Yes"); + } + else + { + // human text for Boolean value + return _("No"); + } +} + + /** * Return a pretty description of a byte count * -- 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] r67403 - in /trunk/s390/src: dasd/dialogs.ycp modules/DASDController.ycp zfcp/dialogs.ycp
by aschnell＠svn2.opensuse.org 10 Feb '12

10 Feb '12

Author: aschnell Date: Fri Feb 10 11:45:05 2012 New Revision: 67403 URL: http://svn.opensuse.org/viewcvs/yast?rev=67403&view=rev Log: - replaced FourDigitHex by tohexstring - removed unneeded casts Modified: trunk/s390/src/dasd/dialogs.ycp trunk/s390/src/modules/DASDController.ycp trunk/s390/src/zfcp/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 Fri Feb 10 11:45:05 2012 @@ -98,36 +98,24 @@ else { items = maplist(integer k, map<string, any> d, devices, { - boolean active = (boolean)(d["resource", "io", 0, "active"]:false); - integer channel = (integer)(d["resource", "io", 0, "start"]:0); - string str_channel = (string)(d["channel"]:""); - string access = toupper ((string)(d["resource", "io", 0, "mode"]:"RO")); + boolean active = d["resource", "io", 0, "active"]:false; + integer channel = d["resource", "io", 0, "start"]:0; + string str_channel = d["channel"]:""; + string access = toupper(d["resource", "io", 0, "mode"]:"RO"); string diag = DASDController::diag[str_channel]:false // table cell ? _("Yes") // table cell : _("No"); string device = d["dev_name"]:""; - string type = toupper (sformat ("%1/%2, %3/%4", - substring ( - DASDController::FourDigitHex ( - d["device_id"]:0 & tointeger ("0xffff") - ), - 2), - substring ( - DASDController::FourDigitHex (d["detail", "cu_model"]:0), - 4), - substring ( - DASDController::FourDigitHex ( - d["sub_device_id"]:0 & tointeger ("0xffff") - ), - 2), - substring ( - DASDController::FourDigitHex (d["detail", "dev_model"]:0), - 4) + string type = toupper(sformat("%1/%2, %3/%4", + substring(tohexstring(d["device_id"]:0 & 0xffff, 4), 2), + substring(tohexstring(d["detail", "cu_model"]:0, 4), 4), + substring(tohexstring(d["sub_device_id"]:0 & 0xffff, 4), 2), + substring(tohexstring(d["detail", "dev_model"]:0, 4), 4) )); - string formatted = (boolean)d["formatted"]:false + string formatted = d["formatted"]:false // table cell ? _("Yes") // table cell 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 Fri Feb 10 11:45:05 2012 @@ -323,26 +323,6 @@ /** - * Translate integer number to its hexadecimal representation with leading - * 0x and exactliy 4 hexadecimal numbers - * @param i integer integer number - * @return string hexadecimal number - */ -global define string FourDigitHex(integer i) ``{ - string s = tohexstring(i); - string zeros = ""; - - integer l = 6 - size(s); - - while (l > 0) { - zeros = zeros + "0"; - l = l - 1; - } - - return substring(s, 0, 2) + zeros + substring(s, 2); -} - -/** * Probe for DASD disks */ global define void ProbeDisks () { Modified: trunk/s390/src/zfcp/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/zfcp/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/zfcp/dialogs.ycp (original) +++ trunk/s390/src/zfcp/dialogs.ycp Fri Feb 10 11:45:05 2012 @@ -58,7 +58,7 @@ list<term> items = []; items = maplist(integer k, map<string, any> d, devices, { - string dev_name = (string)(d["dev_name"]:""); + string dev_name = d["dev_name"]:""; string channel = d["detail", "controller_id"]:"unknown"; string wwpn = d["detail", "wwpn"]:"unknown"; string fcp_lun = d["detail", "fcp_lun"]:"unknown"; -- 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] r67402 - in /trunk/s390/src: dasd/dialogs.ycp zfcp/dialogs.ycp
by aschnell＠svn2.opensuse.org 10 Feb '12

10 Feb '12

Author: aschnell Date: Fri Feb 10 11:35:10 2012 New Revision: 67402 URL: http://svn.opensuse.org/viewcvs/yast?rev=67402&view=rev Log: - removed some unneeded casts Modified: trunk/s390/src/dasd/dialogs.ycp trunk/s390/src/zfcp/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 Fri Feb 10 11:35:10 2012 @@ -80,7 +80,7 @@ if (Mode::config ()) { - items = (list<term>) maplist (integer k, map<string,any> d, devices, { + items = maplist (integer k, map<string,any> d, devices, { string channel = d["channel_id"]:""; string diag = d["diag"]:false // table cell @@ -92,12 +92,12 @@ ? _("Yes") // table cell : _("No"); - return `item (`id (k), channel, format, diag); + return `item (`id(k), channel, format, diag); }); - return items; } - - items = (list<term>) maplist (integer k, map<string,any> d, devices, ``{ + else + { + items = maplist(integer k, map<string, any> d, devices, { boolean active = (boolean)(d["resource", "io", 0, "active"]:false); integer channel = (integer)(d["resource", "io", 0, "start"]:0); string str_channel = (string)(d["channel"]:""); @@ -133,14 +133,14 @@ // table cell : _("No"); string partition_info = d["partition_info"]:"--"; - boolean activate = d["activate"]:false; string selected = DASDController::selected[k]:false // table cell ? _("Yes") : "-"; - if (!active) { + if (!active) + { type = "--"; access = "--"; formatted = "--"; @@ -148,13 +148,11 @@ device = "--"; } - term t = `item (`id (k), selected, str_channel, device, - type ,access); - t = add (t, diag); - t = add (t, formatted); - t = add (t, partition_info); - return t; + return `item(`id(k), selected, str_channel, device, type, access, diag, formatted, + partition_info); }); + } + return items; } Modified: trunk/s390/src/zfcp/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/zfcp/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/zfcp/dialogs.ycp (original) +++ trunk/s390/src/zfcp/dialogs.ycp Fri Feb 10 11:35:10 2012 @@ -57,7 +57,7 @@ list<term> items = []; - items = (list<term>) maplist (integer k, map<string,any> d, devices, ``{ + items = maplist(integer k, map<string, any> d, devices, { string dev_name = (string)(d["dev_name"]:""); string channel = d["detail", "controller_id"]:"unknown"; string wwpn = d["detail", "wwpn"]:"unknown"; @@ -69,9 +69,9 @@ ? _("Yes") : "-"; - term t = `item (`id (k), channel, wwpn, fcp_lun); - return t; + return `item(`id(k), channel, wwpn, fcp_lun); }); + return items; } -- 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] r67401 - in /trunk/s390/src: dasd/dialogs.ycp zfcp/dialogs.ycp
by aschnell＠svn2.opensuse.org 10 Feb '12

10 Feb '12

Author: aschnell Date: Fri Feb 10 11:25:17 2012 New Revision: 67401 URL: http://svn.opensuse.org/viewcvs/yast?rev=67401&view=rev Log: - code simplifications Modified: trunk/s390/src/dasd/dialogs.ycp trunk/s390/src/zfcp/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 Fri Feb 10 11:25:17 2012 @@ -6,9 +6,7 @@ * * $Id$ */ - { - textdomain "s390"; import "Arch"; @@ -163,8 +161,8 @@ /** * Draw the DASD dialog */ -define void DisplayDASDDialog() { - +void DisplayDASDDialog() +{ string help_key = Mode::config () ? "disk_selection_config" : "disk_selection"; @@ -176,7 +174,7 @@ string caption = _("DASD Disk Management"); term header = `header( - // table header + // table header _("Sel."), // table header `Right(_("Channel")), @@ -187,11 +185,12 @@ // table header _("Access Type"), // table header - _("Use DIAG")); - // table header - header = add (header, _("Formatted")); - // table header - header = add (header, _("Partition Information")); + _("Use DIAG"), + // table header + _("Formatted"), + // table header + _("Partition Information") + ); if (Mode::config ()) { @@ -207,17 +206,16 @@ list actions = [ // menu button id - `item (`id (`activate), _("&Activate")), + `item(`id(`activate), _("&Activate")), + // menu button id + `item(`id(`deactivate), _("&Deactivate")), + // menu button id + `item(`id(`diag_on), _("Set DIAG O&n")), + // menu button id + `item(`id(`diag_off), _("Set DIAG O&ff")), // menu button id - `item (`id(`deactivate), _("&Deactivate")), + `item(`id(`format), _("&Format")) ]; - // menu button id - actions = add (actions, `item (`id(`diag_on), _("Set DIAG O&n"))); - // menu button id - actions = add (actions, `item (`id(`diag_off), _("Set DIAG O&ff"))); - - // menu button id - actions = add (actions, `item (`id(`format), _("&Format"))); /* Dialog content */ term content = `VBox( @@ -232,7 +230,7 @@ `PushButton (`id (`filter), _("&Filter")) ) ), - `Table(`id(`table), `opt (`notify), header, []), + `Table(`id(`table), `opt(`notify), header, []), Mode::config () ? `HBox ( // push button @@ -582,7 +580,4 @@ } - -// EOF } - Modified: trunk/s390/src/zfcp/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/zfcp/dialogs.ycp?rev=67… ============================================================================== --- trunk/s390/src/zfcp/dialogs.ycp (original) +++ trunk/s390/src/zfcp/dialogs.ycp Fri Feb 10 11:25:17 2012 @@ -6,9 +6,7 @@ * * $Id$ */ - { - textdomain "s390"; import "Arch"; @@ -98,14 +96,23 @@ /** * Show the ZFCP-Dialog */ -define void DisplayZFCPDialog () { - +void DisplayZFCPDialog() +{ /* Minimal text for the help */ string help = ZFCP_HELPS["disk_selection"]:""; /* Dialog caption */ string caption = _("Configured ZFCP Devices"); + term header = `header( + // table header + `Right(_("Channel Number")), + // table header + `Right(_("WWPN")), + // table header + `Right(_("ZFCP-LUN")) + ); + /* Dialog content */ term content = `VBox( `HBox( @@ -120,18 +127,7 @@ ) ), `HBox( - `Table( - `id(`table), `opt(`keepSorting, `notify), - `header( - // table header - `Right(_("Channel Number")), - // table header - `Right(_("WWPN")), - // table header - `Right(_("zfcp-LUN")) - ), - [] - ) + `Table(`id(`table), `opt(`notify), header, []) ), `HBox( `PushButton(`id(`add), Label::AddButton ()), @@ -378,7 +374,4 @@ } - -// EOF } - -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0