February 2012 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r67480 - /trunk/s390/src/dasd/dialogs.ycp
by aschnell＠svn2.opensuse.org 17 Feb '12

17 Feb '12

Author: aschnell Date: Fri Feb 17 18:01:25 2012 New Revision: 67480 URL: http://svn.opensuse.org/viewcvs/yast?rev=67480&view=rev Log: - improved input validation 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 17 18:01:25 2012 @@ -518,14 +518,18 @@ { // error popup Popup::Error(_("Not a valid channel.")); + UI::SetFocus(`channel); ret = nil; + continue; } if (DASDController::GetDeviceIndex(channel) != nil) { // error popup Popup::Error(_("Channel already exists.")); + UI::SetFocus(`channel); 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] r67479 - /trunk/s390/src/zfcp/dialogs.ycp
by aschnell＠svn2.opensuse.org 17 Feb '12

17 Feb '12

Author: aschnell Date: Fri Feb 17 18:00:58 2012 New Revision: 67479 URL: http://svn.opensuse.org/viewcvs/yast?rev=67479&view=rev Log: - improved input validation Modified: trunk/s390/src/zfcp/dialogs.ycp 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 17 18:00:58 2012 @@ -75,9 +75,6 @@ */ void ReloadZFCPDialog() { - ZFCPController::filter_min = (string) UI::QueryWidget(`min_chan, `Value); - ZFCPController::filter_max = (string) UI::QueryWidget(`max_chan, `Value); - ZFCPController::ProbeDisks(); list<term> items = GetZFCPDiskItems(); @@ -106,7 +103,7 @@ // table header `Right(_("ZFCP-LUN")) ); - + /* Dialog content */ term content = `VBox( `HBox( @@ -160,8 +157,23 @@ selected = (integer) UI::QueryWidget (`id (`table), `CurrentItem); - if (ret == `filter) { - ReloadZFCPDialog (); + if (ret == `filter) + { + string filter_min = (string) UI::QueryWidget(`min_chan, `Value); + string filter_max = (string) UI::QueryWidget(`max_chan, `Value); + + if (!ZFCPController::ValidChannel(filter_min) || !ZFCPController::ValidChannel(filter_max)) + { + // error popup + Popup::Error(_("Invalid filter channels.")); + ret = nil; + continue; + } + + ZFCPController::filter_min = filter_min; + ZFCPController::filter_max = filter_max; + + ReloadZFCPDialog(); ret = nil; continue; } @@ -289,11 +301,13 @@ Wizard::RestoreBackButton (); Wizard::RestoreAbortButton (); - any ret = nil; + UI::ChangeWidget(`id(`channel), `ValidChars, "0123456789abcdefABCDEF."); + UI::ChangeWidget(`id(`wwpn), `ValidChars, "0123456789abcdefABCDEFx"); + symbol ret = nil; while (ret == nil) { - ret = UI::UserInput(); + ret = (symbol) UI::UserInput(); if (ret == `get_wwpn){ list<string> items = ZFCPController::GetWWPNs((string)UI::QueryWidget(`channel, `Value)); @@ -316,45 +330,59 @@ } else if (ret == `next) { - string wwpn = (string)UI::QueryWidget (`id (`wwpn), `Value); - boolean ok = true; - if (substring (wwpn, 0, 2) != "0x") - ok = false; - wwpn = substring (wwpn, 2); - if (size (wwpn) != 16) - ok = false; - if (size (filterchars (wwpn, "1234567890abcdef")) != 16) - ok = false; - if (! ok) + string channel = (string) UI::QueryWidget(`id(`channel), `Value); + string wwpn = (string) UI::QueryWidget(`id(`wwpn), `Value); + string fcp_lun = (string) UI::QueryWidget(`id(`fcp_lun), `Value); + + if (!ZFCPController::ValidChannel(channel)) { - // error report - Report::Error (_("The entered WWPN is invalid.")); - UI::SetFocus (`wwpn); + // error popup + Popup::Error(_("Not a valid channel.")); + UI::SetFocus(`channel); ret = nil; + continue; + } + + if (!ZFCPController::ValidWWPN(wwpn)) + { + // error popup + Report::Error(_("The entered WWPN is invalid.")); + UI::SetFocus(`wwpn); + ret = nil; + continue; + } + + if (!ZFCPController::ValidFCPLUN(fcp_lun)) + { + // error popup + Report::Error(_("The entered FCP-LUN is invalid.")); + UI::SetFocus(`fcp_lun); + ret = nil; + continue; } } } if (ret == `next) { - string channel = (string)UI::QueryWidget (`id (`channel), `Value); - string wwpn = (string)UI::QueryWidget (`id (`wwpn), `Value); - string lun = (string)UI::QueryWidget (`id (`fcp_lun), `Value); + string channel = (string) UI::QueryWidget(`id(`channel), `Value); + string wwpn = (string) UI::QueryWidget(`id(`wwpn), `Value); + string lun = (string) UI::QueryWidget(`id(`fcp_lun), `Value); ZFCPController::previous_settings["wwpm"] = wwpn; ZFCPController::previous_settings["fcp_lun"] = lun; ZFCPController::previous_settings["channel"] = channel; - if (Mode::config ()) + + if (Mode::config()) { map<string,any> m = $[ "controller_id" : channel, "wwpn" : wwpn, "fcp_lun" : lun, ]; + m = $["detail" : m ]; - integer index = -1; - while (haskey (ZFCPController::devices, index)) - index = index + 1; - ZFCPController::devices[index] = m; + + ZFCPController::AddDevice(m); } else { @@ -362,7 +390,7 @@ } } - return (symbol) ret; + 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] r67478 - /trunk/s390/src/modules/ZFCPController.ycp
by aschnell＠svn2.opensuse.org 17 Feb '12

17 Feb '12

Author: aschnell Date: Fri Feb 17 17:59:43 2012 New Revision: 67478 URL: http://svn.opensuse.org/viewcvs/yast?rev=67478&view=rev Log: - moved some functionality to module Modified: trunk/s390/src/modules/ZFCPController.ycp 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 17 17:59:43 2012 @@ -34,6 +34,7 @@ global void ActivateDisk(string channel, string wwpn, string lun); global void ProbeDisks(); +global boolean GetModified(); boolean disk_configured = false; @@ -61,10 +62,6 @@ return hex; } -/** - * Prototypes - */ -global boolean Modified(); /** * Data was modified? @@ -75,17 +72,12 @@ */ 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 * return boolean return true if abort */ -global boolean() AbortFunction = Modified; +global boolean() AbortFunction = GetModified; /** @@ -103,24 +95,53 @@ * 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 */ -global boolean Available () { +global boolean Available() +{ return true; } + + 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); + } + + global boolean ValidWWPN(string wwpn) + { + string regexp = "^0x([0-9a-fA-F]{16})$"; + return regexpmatch(wwpn, regexp); + } + + global boolean ValidFCPLUN(string fcp_lun) + { + string regexp = "^0x([0-9a-fA-F]{16})$"; + return regexpmatch(fcp_lun, regexp); + } + + /** * Read all controller settings * @return true on success */ -global boolean Read() { +global boolean Read() +{ disk_configured = false; return true; } @@ -129,7 +150,8 @@ * Write all controller settings * @return true on success */ -global boolean Write() { +global boolean Write() +{ if (disk_configured && Mode::normal ()) { // popup label @@ -153,7 +175,8 @@ * @param settings The YCP structure to be imported. * @return boolean True on success */ -global boolean Import (map settings) { +global boolean Import(map settings) +{ if (Mode::config ()) { integer index = -1; @@ -183,7 +206,8 @@ * (For use by autoinstallation.) * @return map Dumped settings (later acceptable by Import ()) */ -global map Export () { +global map Export() +{ ProbeDisks(); list<map<string,any> > l = maplist (integer k, map<string,any> v, devices, @@ -243,6 +267,35 @@ } + global void + AddDevice(map<string, any> d) + { + integer index = 0; + while (haskey(devices, index)) + index = index + 1; + devices[index] = d; + } + + + global void + RemoveDevice(integer index) + { + devices = remove(devices, index); + } + + + global integer + GetDeviceIndex(string channel) + { + integer ret = nil; + foreach(integer index , map<string, any> d, devices, { + if (d["channel"]:"0.0.0000" == channel) + ret = index; + }); + return ret; + } + + /** * Create a textual summary and a list of unconfigured cards * @return summary of the current configuration @@ -297,7 +350,7 @@ */ global boolean IsAvailable() { - return size(GetControllers()) > 0; + return !isempty(GetControllers()); } -- 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] r67477 - /trunk/s390/src/clients/zfcp_auto.ycp
by aschnell＠svn2.opensuse.org 17 Feb '12

17 Feb '12

Author: aschnell Date: Fri Feb 17 17:59:01 2012 New Revision: 67477 URL: http://svn.opensuse.org/viewcvs/yast?rev=67477&view=rev Log: - use switch statement Modified: trunk/s390/src/clients/zfcp_auto.ycp Modified: trunk/s390/src/clients/zfcp_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/clients/zfcp_auto.ycp?r… ============================================================================== --- trunk/s390/src/clients/zfcp_auto.ycp (original) +++ trunk/s390/src/clients/zfcp_auto.ycp Fri Feb 17 17:59:01 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,66 +33,92 @@ y2debug("func=%1", func); y2debug("param=%1", param); -/* Create a summary*/ -if(func == "Summary") { - ret = HTML::List(ZFCPController::Summary()); -} -/* Reset configuration */ -else if (func == "Reset") { - ZFCPController::Import($[]); - ret = $[]; -} -/* Change configuration (run AutoSequence) */ -else if (func == "Change") { - ret = ZFCPAutoSequence(); -} -/* Import configuration */ -else if (func == "Import") { - ret = ZFCPController::Import(param); -} -/* Return actual state */ -else if (func == "Export") { - ret = ZFCPController::Export(); -} -/* did configuration change */ -else if (func == "GetModified") { - ret = ZFCPController::modified; -} -/* set configuration as changed */ -else if (func == "SetModified") { - ZFCPController::modified = true; - ret = true; -} -/* Return needed packages */ -else if (func == "Packages") { - ret = ZFCPController::AutoPackages(); -} -/* Read current state */ -else if (func == "Read") { - import "Progress"; - Progress::off(); - ret = ZFCPController::Read(); - Progress::on(); -} -/* Write given settings */ -else if (func == "Write") { - import "Progress"; - Progress::off(); - ZFCPController::write_only = true; - ret = ZFCPController::Write(); - Progress::on(); -} -/* Unknown function */ -else { - y2error("Unknown function: %1", func); - ret = false; -} + switch (func) + { + case "Summary": // Create a summary + { + ret = HTML::List(ZFCPController::Summary()); + break; + } + + case "Reset": // Reset configuration + { + ZFCPController::Import($[]); + ZFCPController::SetModified(true); + ret = $[]; + break; + } + + case "Change": // Change configuration + { + ret = ZFCPAutoSequence(); + ZFCPController::SetModified(true); + break; + } + + case "Import": // Import configuration + { + ret = ZFCPController::Import(param); + ZFCPController::SetModified(true); + break; + } + + case "Export": // Return actual state + { + ret = ZFCPController::Export(); + ZFCPController::SetModified(false); + break; + } + + case "GetModified": // Did configuration change + { + ret = ZFCPController::GetModified(); + break; + } + + case "SetModified": // Set configuration as changed + { + ZFCPController::SetModified(true); + ret = true; + break; + } + + case "Packages": // Return needed packages + { + ret = ZFCPController::AutoPackages(); + break; + } + + case "Read": // Read current state + { + import "Progress"; + Progress::off(); + ret = ZFCPController::Read(); + Progress::on(); + ZFCPController::SetModified(true); + break; + } + + case "Write": // Write given settings + { + import "Progress"; + Progress::off(); + ret = ZFCPController::Write(); + Progress::on(); + break; + } + + default: // Unknown function + { + y2error("Unknown function: %1", func); + ret = false; + break; + } + } y2debug("ret=%1", ret); y2milestone("ZFCP auto finished"); y2milestone("----------------------------------------"); return ret; - -/* EOF */ } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67476 - in /branches/SuSE-Code-11-SP2-Branch/qt: VERSION.cmake package/yast2-qt.changes src/YQTable.cc
by tgoettlicher＠svn2.opensuse.org 17 Feb '12

17 Feb '12

Author: tgoettlicher Date: Fri Feb 17 16:27:50 2012 New Revision: 67476 URL: http://svn.opensuse.org/viewcvs/yast?rev=67476&view=rev Log: Fixed selection and sorting in Table widget (bnc#746156) -This line, and those below, will be ignored-- M qt/VERSION.cmake M qt/src/YQTable.cc M qt/package/yast2-qt.changes Modified: branches/SuSE-Code-11-SP2-Branch/qt/VERSION.cmake branches/SuSE-Code-11-SP2-Branch/qt/package/yast2-qt.changes branches/SuSE-Code-11-SP2-Branch/qt/src/YQTable.cc Modified: branches/SuSE-Code-11-SP2-Branch/qt/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/qt/VE… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/qt/VERSION.cmake (original) +++ branches/SuSE-Code-11-SP2-Branch/qt/VERSION.cmake Fri Feb 17 16:27:50 2012 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "21") -SET(VERSION_PATCH "5") +SET(VERSION_PATCH "6") Modified: branches/SuSE-Code-11-SP2-Branch/qt/package/yast2-qt.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/qt/pa… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/qt/package/yast2-qt.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/qt/package/yast2-qt.changes Fri Feb 17 16:27:50 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Feb 17 16:27:15 CET 2012 - tgoettlicher(a)suse.de + +- Fixed selection and sorting in Table widget (bnc#746156) +- V 2.21.6 + +------------------------------------------------------------------- Thu Dec 1 17:52:42 CET 2011 - tgoettlicher(a)suse.de - Follow links to anchors in YQTextBrowser (bnc #727330) Modified: branches/SuSE-Code-11-SP2-Branch/qt/src/YQTable.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/qt/sr… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/qt/src/YQTable.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/qt/src/YQTable.cc Fri Feb 17 16:27:50 2012 @@ -71,6 +71,8 @@ layout->addWidget( _qt_listView ); _qt_listView->setAllColumnsShowFocus( true ); _qt_listView->header()->setStretchLastSection( false ); + _qt_listView->sortItems( 0, Qt::AscendingOrder); + setKeepSorting( keepSorting() ); @@ -214,8 +216,6 @@ if ( sel ) YQTable::selectItem( sel, true ); - _qt_listView->sortItems( 0, Qt::AscendingOrder); - for ( int i=0; i < columns(); i++ ) _qt_listView->resizeColumnToContents( i ); } @@ -295,7 +295,7 @@ void YQTable::slotSelected( QTreeWidgetItem * listViewItem ) { - if ( listViewItem ) + if ( listViewItem && listViewItem->isSelected() ) selectOrigItem( listViewItem ); else { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67475 - in /trunk/qt: VERSION.cmake package/yast2-qt.changes src/YQTable.cc
by tgoettlicher＠svn2.opensuse.org 17 Feb '12

17 Feb '12

Author: tgoettlicher Date: Fri Feb 17 16:17:55 2012 New Revision: 67475 URL: http://svn.opensuse.org/viewcvs/yast?rev=67475&view=rev Log: Fixed selection and sorting in Table widget (bnc#746156) (2.22.3) Modified: trunk/qt/VERSION.cmake trunk/qt/package/yast2-qt.changes trunk/qt/src/YQTable.cc Modified: trunk/qt/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/VERSION.cmake?rev=67475&r1=67… ============================================================================== --- trunk/qt/VERSION.cmake (original) +++ trunk/qt/VERSION.cmake Fri Feb 17 16:17:55 2012 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "22") -SET(VERSION_PATCH "2") +SET(VERSION_PATCH "3") Modified: trunk/qt/package/yast2-qt.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/package/yast2-qt.changes?rev=… ============================================================================== --- trunk/qt/package/yast2-qt.changes (original) +++ trunk/qt/package/yast2-qt.changes Fri Feb 17 16:17:55 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Feb 17 16:17:32 CET 2012 - tgoettlicher(a)suse.de + +- Fixed selection and sorting in Table widget (bnc#746156) +- Version: 2.22.3 + +------------------------------------------------------------------- Wed Feb 8 14:54:15 CET 2012 - tgoettlicher(a)suse.de - Fixed bnc#731540: fixed auto-scroll in LogView Modified: trunk/qt/src/YQTable.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQTable.cc?rev=67475&r1=6… ============================================================================== --- trunk/qt/src/YQTable.cc (original) +++ trunk/qt/src/YQTable.cc Fri Feb 17 16:17:55 2012 @@ -95,6 +95,7 @@ _qt_listView->setHeaderLabels( headers ); _qt_listView->header()->setResizeMode( QHeaderView::Interactive ); + _qt_listView->sortItems( 0, Qt::AscendingOrder); // @@ -216,8 +217,6 @@ if ( sel ) YQTable::selectItem( sel, true ); - _qt_listView->sortItems( 0, Qt::AscendingOrder); - for ( int i=0; i < columns(); i++ ) _qt_listView->resizeColumnToContents( i ); } @@ -297,7 +296,7 @@ void YQTable::slotSelected( QTreeWidgetItem * listViewItem ) { - if ( listViewItem ) + if ( listViewItem && listViewItem->isSelected() ) selectOrigItem( listViewItem ); else { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r67474 - in /trunk/s390/src/modules: DASDController.ycp ZFCPController.ycp
by aschnell＠svn2.opensuse.org 17 Feb '12

17 Feb '12

Author: aschnell Date: Fri Feb 17 16:13:42 2012 New Revision: 67474 URL: http://svn.opensuse.org/viewcvs/yast?rev=67474&view=rev Log: - addad progress popup - cleanup 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 Fri Feb 17 16:13:42 2012 @@ -180,7 +180,7 @@ string command = "/sbin/mkinitrd && /sbin/zipl"; y2milestone("Running command %1", command); any ret = SCR::Execute(.target.bash, command); - y2milestone ("Exit code: %1", ret); + y2milestone("Exit code: %1", ret); UI::CloseDialog(); } @@ -309,12 +309,11 @@ global list<string> Summary() { 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 + // summary text, %1 is channel (number), // %2 and %3 are Yes or No return sformat(_("Channel: %1, Format: %2, DIAG: %3"), d["channel"]:"", String::YesNo(d["format"]:false), String::YesNo(d["diag"]:false)); }); - y2milestone ("Summary: %1", ret); + y2milestone("Summary: %1", ret); return ret; } @@ -407,10 +406,10 @@ /** * Report error occured during device activation - * @param id integer chanel id of the device + * @param channel string channel of the device * @param ret integer exit code of the operation */ -void ReportActivationError(any id, integer ret) +void ReportActivationError(string channel, integer ret) { switch (ret) { @@ -420,59 +419,59 @@ case 1: Report::Error (sformat ( // error report, %1 is device identification - _("%1: sysfs not mounted."), id)); + _("%1: sysfs not mounted."), channel)); break; case 2: Report::Error (sformat ( // error report, %1 is device identification - _("%1: Invalid status for <online>."), id)); + _("%1: Invalid status for <online>."), channel)); break; case 3: Report::Error (sformat ( // error report, %1 is device identification - _("%1: No device found for <ccwid>."), id)); + _("%1: No device found for <ccwid>."), channel)); break; case 4: Report::Error (sformat ( // error report, %1 is device identification - _("%1: Could not change state of the device."), id)); + _("%1: Could not change state of the device."), channel)); 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)); + _("%1: Device is not a DASD."), channel)); 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)); + _("%1: Could not load module."), channel)); 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)); + _("%1: Failed to activate DASD."), channel)); 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)); + _("%1: DASD is not formatted."), channel)); break; default: Report::Error (sformat ( // error report, %1 is device identification, %2 is integer code - _("%1: Unknown error %2."), id, ret)); + _("%1: Unknown error %2."), channel, ret)); break; } } 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 17 16:13:42 2012 @@ -132,15 +132,17 @@ global boolean Write() { if (disk_configured && Mode::normal ()) { + // popup label + UI::OpenDialog(`Label(_("Running mkinitrd and zipl."))); + string command = "/sbin/mkinitrd && /sbin/zipl"; y2milestone ("Running command %1", command); - any ret = SCR::Execute (.target.bash, command); - y2milestone ("Exit code: %1", ret); - } - else - { - y2milestone ("No new disk configured"); + any ret = SCR::Execute(.target.bash, command); + y2milestone("Exit code: %1", ret); + + UI::CloseDialog(); } + return true; } @@ -248,26 +250,25 @@ global list<string> Summary() { list<string> ret = maplist (integer index, map<string,any> d, devices, { - // summary text, %1 is channel ID, %1 is WWPN, %3 is LUN + // summary text, %1 is channel, %1 is WWPN, %3 is LUN // (all of them are numbers) - string s = sformat (_("Channel ID: %1, WWPN: %2, ZFCP LUN: %3"), - d["detail","controller_id"]:"", - d["detail","wwpn"]:"", - d["detail","fcp_lun"]:"" - ); - return s; + return sformat(_("Channel: %1, WWPN: %2, ZFCP LUN: %3"), + d["detail", "controller_id"]:"", d["detail", "wwpn"]:"", + d["detail", "fcp_lun"]:""); }); - y2milestone ("Summary: %1", ret); + 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":[] ]; } @@ -331,10 +332,10 @@ /** * Report error occured during device activation - * @param id integer chanel id of the device + * @param channel string channel of the device * @param ret integer exit code of the operation */ -void ReportActivationError(any id, integer ret) +void ReportActivationError(string channel, integer ret) { switch (ret) { @@ -344,61 +345,61 @@ case 1: Report::Error (sformat ( // error report, %1 is device identification - _("%1: sysfs not mounted."), id)); + _("%1: sysfs not mounted."), channel)); break; case 2: Report::Error (sformat ( // error report, %1 is device identification - _("%1: Invalid status for <online>."), id)); + _("%1: Invalid status for <online>."), channel)); break; case 3: Report::Error (sformat ( // error report, %1 is device identification - _("%1: No device found for <ccwid>."), id)); + _("%1: No device found for <ccwid>."), channel)); break; case 4: Report::Error (sformat ( // error report, %1 is device identification - _("%1: WWPN invalid."), id)); + _("%1: WWPN invalid."), channel)); break; case 5: Report::Error (sformat ( // error report, %1 is device identification - _("%1: Could not activate WWPN for adapter %1."), id)); + _("%1: Could not activate WWPN for adapter %1."), channel)); break; case 6: Report::Error (sformat ( // error report, %1 is device identification - _("%1: Could not activate ZFCP device."), id)); + _("%1: Could not activate ZFCP device."), channel)); break; case 7: Report::Error (sformat ( // error report, %1 is device identification - _("%1: SCSI disk could not be deactivated."), id)); + _("%1: SCSI disk could not be deactivated."), channel)); break; case 8: Report::Error (sformat ( // error report, %1 is device identification - _("%1: ZFCP LUN could not be unregistered."), id)); + _("%1: ZFCP LUN could not be unregistered."), channel)); break; case 9: Report::Error (sformat ( // error report, %1 is device identification - _("%1: ZFCP WWPN could not be unregistered."), id)); + _("%1: ZFCP WWPN could not be unregistered."), channel)); break; default: Report::Error (sformat ( // error report, %1 is device identification, %2 is integer code - _("%1: Unknown error %2."), id, ret)); + _("%1: Unknown error %2."), channel, ret)); break; } } @@ -406,10 +407,10 @@ /** * Report error occured during device activation - * @param id integer chanel id of the device + * @param channel string channel of the device * @param ret integer exit code of the operation */ -void ReportControllerActivationError(any id, integer ret) +void ReportControllerActivationError(string channel, integer ret) { switch (ret) { @@ -419,43 +420,43 @@ case 1: Report::Error (sformat ( // error report, %1 is device identification - _("%1: sysfs not mounted."), id)); + _("%1: sysfs not mounted."), channel)); break; case 2: Report::Error (sformat ( // error report, %1 is device identification - _("%1: Invalid status for <online>."), id)); + _("%1: Invalid status for <online>."), channel)); break; case 3: Report::Error (sformat ( // error report, %1 is device identification - _("%1: Device <ccwid> does not exist."), id)); + _("%1: Device <ccwid> does not exist."), channel)); break; case 4: Report::Error (sformat ( // error report, %1 is device identification - _("%1: Module zfcp could not be loaded."), id)); + _("%1: Module zfcp could not be loaded."), channel)); break; case 5: Report::Error (sformat ( // error report, %1 is device identification - _("%1: Adapter status could not be changed."), id)); + _("%1: Adapter status could not be changed."), channel)); break; case 6: Report::Error (sformat ( // error report, %1 is device identification - _("%1: WWPN ports still active."), id)); + _("%1: WWPN ports still active."), channel)); break; default: Report::Error (sformat ( // error report, %1 is device identification, %2 is integer code - _("%1: Unknown error %2."), id, ret)); + _("%1: Unknown error %2."), channel, ret)); break; } } @@ -463,7 +464,7 @@ /** * Activate a disk - * @param channel string channel id + * @param channel string channel * @param wwpn string wwpn (hexa number) * @param lun string lun (hexa number) */ @@ -499,8 +500,8 @@ /** - * Activate a disk - * @param channel string channel id + * Deactivate a disk + * @param channel string channel * @param wwpn string wwpn (hexa number) * @param lun string lun (hexa number) */ -- 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] r67473 - in /trunk/s390/src: clients/Makefile.am dasd/Makefile.am modules/Makefile.am zfcp/Makefile.am
by aschnell＠svn2.opensuse.org 17 Feb '12

17 Feb '12

Author: aschnell Date: Fri Feb 17 14:43:48 2012 New Revision: 67473 URL: http://svn.opensuse.org/viewcvs/yast?rev=67473&view=rev Log: - cleanup Modified: trunk/s390/src/clients/Makefile.am trunk/s390/src/dasd/Makefile.am trunk/s390/src/modules/Makefile.am trunk/s390/src/zfcp/Makefile.am Modified: trunk/s390/src/clients/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/clients/Makefile.am?rev… ============================================================================== --- trunk/s390/src/clients/Makefile.am (original) +++ trunk/s390/src/clients/Makefile.am Fri Feb 17 14:43:48 2012 @@ -1,6 +1,6 @@ -# Makefile.am for zfcp/src - -yncludedir = @yncludedir@/s390/zfcp +# +# Makefile.am for s390/src/clients +# client_DATA = \ zfcp.ycp \ @@ -27,7 +27,6 @@ iucvterminal.desktop \ iucvterminal-server.desktop - EXTRA_DIST = $(client_DATA) $(desktop_DATA) include $(top_srcdir)/Makefile.am.common Modified: trunk/s390/src/dasd/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/dasd/Makefile.am?rev=67… ============================================================================== --- trunk/s390/src/dasd/Makefile.am (original) +++ trunk/s390/src/dasd/Makefile.am Fri Feb 17 14:43:48 2012 @@ -1,4 +1,6 @@ -# Makefile.am for dasd/src +# +# Makefile.am for s390/src/dasd +# yncludedir = @yncludedir@/s390/dasd Modified: trunk/s390/src/modules/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/modules/Makefile.am?rev… ============================================================================== --- trunk/s390/src/modules/Makefile.am (original) +++ trunk/s390/src/modules/Makefile.am Fri Feb 17 14:43:48 2012 @@ -1,4 +1,6 @@ -# Makefile.am for dasd/src +# +# Makefile.am for s390/src/modules +# module_DATA = \ DASDController.ycp \ Modified: trunk/s390/src/zfcp/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/zfcp/Makefile.am?rev=67… ============================================================================== --- trunk/s390/src/zfcp/Makefile.am (original) +++ trunk/s390/src/zfcp/Makefile.am Fri Feb 17 14:43:48 2012 @@ -1,4 +1,6 @@ -# Makefile.am for zfcp/src +# +# Makefile.am for s390/src/zfcp +# yncludedir = @yncludedir@/s390/zfcp @@ -7,7 +9,6 @@ wizards.ycp \ dialogs.ycp - EXTRA_DIST = $(ynclude_DATA) include $(top_srcdir)/Makefile.am.common -- 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] r67472 - /trunk/s390/package/yast2-s390.changes
by aschnell＠svn2.opensuse.org 17 Feb '12

17 Feb '12

Author: aschnell Date: Fri Feb 17 14:43:15 2012 New Revision: 67472 URL: http://svn.opensuse.org/viewcvs/yast?rev=67472&view=rev Log: - fixed typos Modified: trunk/s390/package/yast2-s390.changes 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 17 14:43:15 2012 @@ -1,12 +1,12 @@ ------------------------------------------------------------------- Wed Feb 15 11:25:49 CET 2012 - aschnell(a)suse.de -- make DASD module work for autoyast editor +- make DASD module work with AutoYaST editor ------------------------------------------------------------------- Fri Feb 10 14:59:45 CET 2012 - aschnell(a)suse.de -- used multiselection table in main DASD dialog +- use multiselection table in main DASD dialog ------------------------------------------------------------------- Wed Dec 7 10:04:50 UTC 2011 - coolo(a)suse.com @@ -506,7 +506,7 @@ Wed Mar 10 11:11:20 CET 2004 - jsrain(a)suse.de - added checking of DASD-only/zFCP-only/mixed system -- removed filter support fro zFCP disks +- removed filter support for zFCP disks - fixed .spec file (use ExclusiveArch) - fixed parameters of dasd_configure script - better defaults for new ZFCP disk, combo box for channels -- 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] r67471 - in /trunk/s390/src/config: dasd.rnc zfcp.rnc
by aschnell＠svn2.opensuse.org 17 Feb '12

17 Feb '12

Author: aschnell Date: Fri Feb 17 14:42:48 2012 New Revision: 67471 URL: http://svn.opensuse.org/viewcvs/yast?rev=67471&view=rev Log: - updated schemas Modified: trunk/s390/src/config/dasd.rnc trunk/s390/src/config/zfcp.rnc Modified: trunk/s390/src/config/dasd.rnc URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/config/dasd.rnc?rev=674… ============================================================================== --- trunk/s390/src/config/dasd.rnc (original) +++ trunk/s390/src/config/dasd.rnc Fri Feb 17 14:42:48 2012 @@ -2,88 +2,13 @@ namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0" namespace config = "http://www.suse.com/1.0/configns" - dasd = element dasd { element devices { LIST, element listentry { - element bus { text }? & - element bus_hwcfg { text }? & - element channel { text }? & - element class_id { INTEGER }? & - element detail { - element cu_model { INTEGER }? & - element dev_model { INTEGER }? & - element lcss { INTEGER }? - }? & - element dev_name { text }? & - element dev_names { - LIST, - element listentry { text }* - }? & - element dev_num { - element major { INTEGER }? & - element minor { INTEGER }? & - element range { INTEGER }? & - element type { text }? - }? & - element device { text }? & - element device_id { INTEGER }? & - element driver { text }? & - element drivers { - LIST, - element listentry { - element active { BOOLEAN }? & - element modprobe { BOOLEAN }? & - element modules { - LIST, - element module_entry { - LIST, - element listentry { text }* - }* - }* - }* - }? & - element formatted { BOOLEAN }? & - element model { text }? & - element old_unique_key { text }? & - element partition_info { text }? & - element prog_if { INTEGER }? & - element resource { - element disk_log_geo { - LIST, - element listentry { - element cylinders { INTEGER }? & - element heads { INTEGER }? & - element sectors { INTEGER }? - }* - }? & - element io { - LIST, - element listentry { - element active { BOOLEAN }? & - element length { INTEGER }? & - element mode { text }? & - element start { INTEGER }? - }* - }? & - element size { - LIST, - element listentry { - element unit { text }? & - element x { INTEGER }? & - element y { INTEGER }? - }* - }? - }? & - element sub_class_id { INTEGER }? & - element sub_device_id { INTEGER }? & - element sysfs_bus_id { text }? & - element udi { text }? & - element unique_key { text }? & - element vendor { text }? & - element vendor_id { INTEGER }? + element channel { text } & + element format { BOOLEAN }? & + element diag { BOOLEAN }? }* }? } - Modified: trunk/s390/src/config/zfcp.rnc URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/config/zfcp.rnc?rev=674… ============================================================================== --- trunk/s390/src/config/zfcp.rnc (original) +++ trunk/s390/src/config/zfcp.rnc Fri Feb 17 14:42:48 2012 @@ -2,15 +2,13 @@ namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0" namespace config = "http://www.suse.com/1.0/configns" - zfcp = element zfcp { element devices { LIST, element listentry { - element controller_id { text }? & - element fcp_lun { text }? & - element wwpn { text }? + element controller_id { text } & + element wwpn { text } & + element fcp_lun { text } }* }? } - -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0