Author: aschnell Date: Fri Jul 22 14:46:26 2011 New Revision: 64935 URL: http://svn.opensuse.org/viewcvs/yast?rev=64935&view=rev Log: - fixed diag mode setting (bnc #591037) Modified: branches/SuSE-Code-11-SP2-Branch/s390/VERSION branches/SuSE-Code-11-SP2-Branch/s390/package/yast2-s390.changes branches/SuSE-Code-11-SP2-Branch/s390/src/dasd/dialogs.ycp branches/SuSE-Code-11-SP2-Branch/s390/yast2-s390.spec.in Modified: branches/SuSE-Code-11-SP2-Branch/s390/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/s390/V... ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/s390/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/s390/VERSION Fri Jul 22 14:46:26 2011 @@ -1 +1 @@ -2.17.18 +2.17.19 Modified: branches/SuSE-Code-11-SP2-Branch/s390/package/yast2-s390.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/s390/p... ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/s390/package/yast2-s390.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/s390/package/yast2-s390.changes Fri Jul 22 14:46:26 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jul 22 14:41:14 CEST 2011 - aschnell@suse.de + +- fixed diag mode setting (bnc #591037) +- 2.17.19 + +------------------------------------------------------------------- Mon Jul 18 10:30:40 CEST 2011 - aschnell@suse.de - include fix for bnc #591603 Modified: branches/SuSE-Code-11-SP2-Branch/s390/src/dasd/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/s390/s... ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/s390/src/dasd/dialogs.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/s390/src/dasd/dialogs.ycp Fri Jul 22 14:46:26 2011 @@ -311,7 +311,8 @@ * Run the dialog for DASD disks configuration * @return symbol for wizard sequencer */ -define symbol DASDDialog() { +symbol DASDDialog() +{ DisplayDASDDialog (); ReloadDASDDialog (); any ret = nil; @@ -320,8 +321,7 @@ { ret = UI::UserInput(); - integer selected = (integer) - UI::QueryWidget (`id (`table), `CurrentItem); + integer selected = (integer) UI::QueryWidget(`id(`table), `CurrentItem); if (ret == `filter) { ReloadDASDDialog (); @@ -391,17 +391,21 @@ } else if (ret == `diag_on) { - 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, ``{ - string channel = DASDController::devices[id,"channel"]:""; + + foreach (integer id, selected, { + string channel = DASDController::devices[id, "channel"]:""; + boolean active = DASDController::devices[id, "resource", "io", 0, "active"]:false; DASDController::diag[channel] = true; + if (active) + DASDController::ActivateDisk(channel, true); }); ReloadDASDDialog (); @@ -411,17 +415,21 @@ } else if (ret == `diag_off) { - 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, ``{ - string channel = DASDController::devices[id,"channel"]:""; + + foreach (integer id, selected, { + string channel = DASDController::devices[id, "channel"]:""; + boolean active = DASDController::devices[id, "resource", "io", 0, "active"]:false; DASDController::diag[channel] = false; + if (active) + DASDController::ActivateDisk(channel, false); }); ReloadDASDDialog (); Modified: branches/SuSE-Code-11-SP2-Branch/s390/yast2-s390.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/s390/y... ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/s390/yast2-s390.spec.in (original) +++ branches/SuSE-Code-11-SP2-Branch/s390/yast2-s390.spec.in Fri Jul 22 14:46:26 2011 @@ -2,7 +2,7 @@ @HEADER@ BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-devtools yast2-testsuite -Requires: yast2 +Requires: yast2 yast2-core >= 2.17.37 %ifarch s390 s390x Requires: s390-tools %endif -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org