February 2012 - YaST Commits - openSUSE Mailing Lists

[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

[yast-commit] r67470 - /tags/stable-2_21_5/nfs-client/
by mfilka＠svn2.opensuse.org 17 Feb '12

17 Feb '12

Author: mfilka Date: Fri Feb 17 14:19:27 2012 New Revision: 67470 URL: http://svn.opensuse.org/viewcvs/yast?rev=67470&view=rev Log: Created tag stable-2_21_5 for nfs-client Added: tags/stable-2_21_5/nfs-client/ (props changed) - copied from r67469, trunk/nfs-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] r67469 - in /trunk/nfs-client: VERSION package/yast2-nfs-client.changes src/routines.ycp testsuite/tests/r-check.out testsuite/tests/r-check.ycp testsuite/tests/r-spec.out testsuite/tests/r-spec.ycp
by mfilka＠svn2.opensuse.org 17 Feb '12

17 Feb '12

Author: mfilka Date: Fri Feb 17 14:18:54 2012 New Revision: 67469 URL: http://svn.opensuse.org/viewcvs/yast?rev=67469&view=rev Log: IPv6 addresses supported - bnc#719538 Modified: trunk/nfs-client/VERSION trunk/nfs-client/package/yast2-nfs-client.changes trunk/nfs-client/src/routines.ycp trunk/nfs-client/testsuite/tests/r-check.out trunk/nfs-client/testsuite/tests/r-check.ycp trunk/nfs-client/testsuite/tests/r-spec.out trunk/nfs-client/testsuite/tests/r-spec.ycp Modified: trunk/nfs-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/VERSION?rev=67469&r1=… ============================================================================== --- trunk/nfs-client/VERSION (original) +++ trunk/nfs-client/VERSION Fri Feb 17 14:18:54 2012 @@ -1 +1 @@ -2.21.4 +2.21.5 Modified: trunk/nfs-client/package/yast2-nfs-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/package/yast2-nfs-cli… ============================================================================== --- trunk/nfs-client/package/yast2-nfs-client.changes (original) +++ trunk/nfs-client/package/yast2-nfs-client.changes Fri Feb 17 14:18:54 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Feb 17 13:14:44 UTC 2012 - mfilka(a)suse.com + +- IPv6 addresses supported - bnc#719538 +- updated testsuite +- 2.21.5 + +------------------------------------------------------------------- Thu Feb 16 13:16:18 UTC 2012 - mfilka(a)suse.com - removed some dead code, whitespaces Modified: trunk/nfs-client/src/routines.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/src/routines.ycp?rev=… ============================================================================== --- trunk/nfs-client/src/routines.ycp (original) +++ trunk/nfs-client/src/routines.ycp Fri Feb 17 14:18:54 2012 @@ -23,17 +23,29 @@ import "Package"; import "Report"; + import "IP"; + import "String"; /** * @param spec "server:/path/specification" * @return `couple("server", "/path/specification") */ define term SpecToServPath(string spec) ``{ - integer colonpos = findfirstof(spec, ":"); + // split using ":/" (because of IPv6) + integer path_begin = search( spec, ":/"); string serv = ""; - if (colonpos != nil) { - serv = substring(spec, 0, colonpos); - spec = substring(spec, colonpos+1); + + // no :/ inside => <server>: or [/]<path> + if( path_begin == nil ) + { + if(spec == filterchars(spec, "-_." + String::CAlnum() ) + ":") + // matches [a-zA-Z0-1.-_] and ends with colon? => <server>: + path_begin = size( spec) -1; + } + + if (path_begin != nil) { + serv = substring(spec, 0, path_begin); + spec = substring(spec, path_begin+1); } return `couple(serv, spec); } @@ -68,16 +80,22 @@ * @return whether valid */ define boolean CheckHostName(string name) ``{ + string dirname_forbidden = ":"; + if (size(name) > 0 && size(name) < 50 && - name == filterchars(name, - "-_.0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz")) { + name == filterchars(name, "-_.:" + String::CAlnum() )) { + if( IP::Check( name)) + return true; + if( "" != filterchars( name, dirname_forbidden)) + return false; + return true; } else // error popup message Report::Error (sformat(_("The hostname entered is invalid. It must be shorter than 50 characters and only use -0-9, A-Z, a-z, dots, -, and _."))); +0-9, A-Z, a-z, dots, -, and _.:"))); return false; }; Modified: trunk/nfs-client/testsuite/tests/r-check.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/testsuite/tests/r-che… ============================================================================== --- trunk/nfs-client/testsuite/tests/r-check.out (original) +++ trunk/nfs-client/testsuite/tests/r-check.out Fri Feb 17 14:18:54 2012 @@ -14,3 +14,6 @@ Return false Return false Return false +Return true +Return false +Return true Modified: trunk/nfs-client/testsuite/tests/r-check.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/testsuite/tests/r-che… ============================================================================== --- trunk/nfs-client/testsuite/tests/r-check.ycp (original) +++ trunk/nfs-client/testsuite/tests/r-check.ycp Fri Feb 17 14:18:54 2012 @@ -19,6 +19,9 @@ string OK_Name = "foo.bar.com.tw"; string TooLongName = "123456789012345678901234567890123456789012345678901234567890"; string IllegalName = "Something:wrong"; + string IPv4 = "192.168.10.1"; + string IPv4_invalid= "192.168.10:1"; + string IPv6 = "fe80::219:d1ff:feac:fd10"; DUMP ("check_options"); TEST (``(check_options ("")), [], nil); @@ -37,5 +40,9 @@ TEST (``(CheckHostName (TooLongName)), [], nil); TEST (``(CheckHostName (IllegalName)), [], nil); // Too long & illegal char - TEST (``(CheckHostName (TooLongName + ":")), [], nil); + TEST (``(CheckHostName (TooLongName + "!")), [], nil); + // check IPv? adresses + TEST (``(CheckHostName (IPv4)), [], nil); + TEST (``(CheckHostName (IPv4_invalid)), [], nil); + TEST (``(CheckHostName (IPv6)), [], nil); } Modified: trunk/nfs-client/testsuite/tests/r-spec.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/testsuite/tests/r-spe… ============================================================================== --- trunk/nfs-client/testsuite/tests/r-spec.out (original) +++ trunk/nfs-client/testsuite/tests/r-spec.out Fri Feb 17 14:18:54 2012 @@ -4,5 +4,5 @@ Return `couple ("", "nocolon.only.server.com") Return `couple ("", "/only/path") Return `couple ("", "/nocolon/only/path") -Return `couple ("two", "colons:used") +Return `couple ("fe80::219:d1ff:feac:fd10", "/path") Return `couple ("", "") Modified: trunk/nfs-client/testsuite/tests/r-spec.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/testsuite/tests/r-spe… ============================================================================== --- trunk/nfs-client/testsuite/tests/r-spec.ycp (original) +++ trunk/nfs-client/testsuite/tests/r-spec.ycp Fri Feb 17 14:18:54 2012 @@ -22,6 +22,6 @@ TEST (``(SpecToServPath ("nocolon.only.server.com")), [], nil); TEST (``(SpecToServPath (":/only/path")), [], nil); TEST (``(SpecToServPath ("/nocolon/only/path")), [], nil); - TEST (``(SpecToServPath ("two:colons:used")), [], nil); + TEST (``(SpecToServPath ("fe80::219:d1ff:feac:fd10:/path")), [], nil); TEST (``(SpecToServPath ("")), [], nil); } -- 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] r67468 - 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 11:39:27 2012 New Revision: 67468 URL: http://svn.opensuse.org/viewcvs/yast?rev=67468&view=rev Log: - improved logging - tiny optimization 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 11:39:27 2012 @@ -99,11 +99,10 @@ 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"]:""); - + string dir = sformat("/sys/bus/ccw/devices/%1/block/", channel); + list<string> files = (list<string>) SCR::Read(.target.dir, dir); + if (size(files) == 1) + return "/dev/" + files[0]:""; return nil; } @@ -480,20 +479,17 @@ /** - * Activate selected Disks + * Activate disk * @param channel string Name of the disk to activate * @param diag boolean Activate DIAG or not */ global void ActivateDisk(string channel, boolean diag) { - string command = sformat ( - "/sbin/dasd_configure '%1' '%2' '%3'", - channel, - 1, - diag ? 1 : 0 - ); - integer ret = (integer)SCR::Execute (.target.bash, command); - y2milestone ("Running command %1 with exit code %2", command, ret); + string command = sformat("/sbin/dasd_configure '%1' %2 %3", channel, 1, diag ? 1 : 0); + y2milestone("Running command \"%1\"", command); + integer ret = (integer) SCR::Execute(.target.bash, command); + y2milestone("Command \"%1\" returned with exit code %2", command, ret); + if (ret == 8) { string popup = sformat (_("Device %1 is not formatted. Format device now? @@ -518,32 +514,33 @@ DeactivateDisk(channel, diag); } else { - ReportActivationError (channel, ret); + ReportActivationError(channel, ret); } + disk_configured = true; } + /** - * Activate selected Disks + * Deactivate disk * @param channel string Name of the disk to deactivate * @param diag boolean Activate DIAG or not */ global void DeactivateDisk(string channel, boolean diag) { - string command = sformat ( - "/sbin/dasd_configure '%1' '%2' '%3'", - channel, - 0, - diag ? 1 : 0 - ); - y2milestone ("Running command %1", command); - integer ret = (integer)SCR::Execute (.target.bash, command); - ReportActivationError (channel, ret); + string command = sformat("/sbin/dasd_configure '%1' %2 %3", channel, 0, diag ? 1 : 0); + y2milestone("Running command \"%1\"", command); + integer ret = (integer) SCR::Execute(.target.bash, command); + y2milestone("Command \"%1\" returned with exit code %2", command, ret); + + ReportActivationError(channel, ret); + disk_configured = true; } + /** - * Activate selected Disks + * Format disks * @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 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 11:39:27 2012 @@ -471,16 +471,14 @@ { if (! activated_controllers[channel]:false) { - string command = sformat ( - "/sbin/zfcp_host_configure '%1' '%2'", - channel, - 1 - ); - y2milestone ("Running command %1", command); - integer ret = (integer)SCR::Execute (.target.bash, command); + string command = sformat("/sbin/zfcp_host_configure '%1' %2", channel, 1); + y2milestone("Running command \"%1\"", command); + integer ret = (integer) SCR::Execute(.target.bash, command); + y2milestone("Command \"%1\" returned with exit code %2", command, ret); + if (ret != 0) { - ReportControllerActivationError (channel, ret); + ReportControllerActivationError(channel, ret); } else { @@ -488,20 +486,18 @@ } } - string command = sformat ( - "/sbin/zfcp_disk_configure '%1' '%2' '%3' '%4'", - channel, - // bugzilla #205503 - HexNumSize (wwpn, 16), - HexNumSize (lun, 16), - 1 - ); - y2milestone ("Running command %1", command); - integer ret = (integer)SCR::Execute (.target.bash, command); - ReportActivationError (channel, ret); + string command = sformat("/sbin/zfcp_disk_configure '%1' '%2' '%3' %4", channel, + HexNumSize(wwpn, 16), HexNumSize(lun, 16), 1); + y2milestone("Running command \"%1\"", command); + integer ret = (integer) SCR::Execute(.target.bash, command); + y2milestone("Command \"%1\" returned with exit code %2", command, ret); + + ReportActivationError(channel, ret); + disk_configured = true; } + /** * Activate a disk * @param channel string channel id @@ -510,20 +506,18 @@ */ global void DeactivateDisk(string channel, string wwpn, string lun) { - string command = sformat ( - "/sbin/zfcp_disk_configure '%1' '%2' '%3' '%4'", - channel, - // bugzilla #205503 - HexNumSize (wwpn, 16), - HexNumSize (lun, 16), - 0 - ); - y2milestone ("Running command %1", command); - integer ret = (integer)SCR::Execute (.target.bash, command); - ReportActivationError (channel, ret); + string command = sformat("/sbin/zfcp_disk_configure '%1' '%2' '%3' %4", channel, + HexNumSize(wwpn, 16), HexNumSize(lun, 16), 0); + y2milestone("Running command \"%1\"", command); + integer ret = (integer) SCR::Execute(.target.bash, command); + y2milestone("Command \"%1\" returned with exit code %2", command, ret); + + ReportActivationError(channel, ret); + disk_configured = true; } + list<string> runCommand(string cmd){ list<string> ret = []; map<string, any> cmd_output = (map<string, any>)SCR::Execute(.target.bash_output, cmd); -- 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] r67467 - in /trunk/s390/src: dasd/dialogs.ycp dasd/helps.ycp modules/DASDController.ycp
by aschnell＠svn2.opensuse.org 16 Feb '12

16 Feb '12

Author: aschnell Date: Thu Feb 16 16:32:06 2012 New Revision: 67467 URL: http://svn.opensuse.org/viewcvs/yast?rev=67467&view=rev Log: - cleanup Modified: trunk/s390/src/dasd/dialogs.ycp trunk/s390/src/dasd/helps.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 Thu Feb 16 16:32:06 2012 @@ -9,7 +9,6 @@ { textdomain "s390"; -import "Arch"; import "DASDController"; import "Label"; import "Mode"; Modified: trunk/s390/src/dasd/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/dasd/helps.ycp?rev=6746… ============================================================================== --- trunk/s390/src/dasd/helps.ycp (original) +++ trunk/s390/src/dasd/helps.ycp Thu Feb 16 16:32:06 2012 @@ -6,9 +6,7 @@ * * $Id$ */ - { - textdomain "s390"; /** @@ -73,22 +71,17 @@ /* Disk add help 1/3 */ "disk_add_config" : _("<big>Add New DASD Disk</big> To add a disk, enter the Channel Number of the DASD disk as -identifier.") +identifier.") + -+ /* Disk add help 1/3 */ _("If the disk should be formatted, use Format the Disk. -") +") + -+ -(Arch::s390_32 () - /* Disk add help 3/3, optional */ - ? _("To use DIAG mode, select Use DIAG. + /* Disk add help 3/3 */ + _("To use DIAG mode, select Use DIAG. ") - : ""), ]; -/* 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 Thu Feb 16 16:32:06 2012 @@ -15,7 +15,6 @@ import "Mode"; import "Report"; -import "Arch"; import "FileUtils"; import "Popup"; import "String"; @@ -487,7 +486,6 @@ */ global void ActivateDisk(string channel, boolean diag) { -// if (! Arch::s390_32 ()) diag = false; string command = sformat ( "/sbin/dasd_configure '%1' '%2' '%3'", channel, @@ -532,7 +530,6 @@ */ global void DeactivateDisk(string channel, boolean diag) { - // if (! Arch::s390_32 ()) diag = false; string command = sformat ( "/sbin/dasd_configure '%1' '%2' '%3'", 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] r67466 - in /trunk/s390/src: dasd/dialogs.ycp modules/DASDController.ycp
by aschnell＠svn2.opensuse.org 16 Feb '12

16 Feb '12

Author: aschnell Date: Thu Feb 16 15:18:01 2012 New Revision: 67466 URL: http://svn.opensuse.org/viewcvs/yast?rev=67466&view=rev Log: - moved functionality to module 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 Thu Feb 16 15:18:01 2012 @@ -543,10 +543,7 @@ "diag" : diag, ]; - integer index = 0; - while (haskey (DASDController::devices, index)) - index = index + 1; - DASDController::devices[index] = d; + DASDController::AddDevice(d); } return ret; @@ -566,10 +563,15 @@ } list<integer> selected = ListSelectedDASD(); - - DASDController::devices = filter(integer index, map<string, any> d, DASDController::devices, { - return !contains(selected, index); - }); + if (isempty(selected)) + { + // error popup message + Popup::Message (_("No disk selected.")); + } + else + { + foreach(integer index, selected, { DASDController::RemoveDevice(index); }); + } return `next; } 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 Thu Feb 16 15:18:01 2012 @@ -275,6 +275,23 @@ } + 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) { -- 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] r67465 - in /trunk/nfs-client: package/yast2-nfs-client.changes src/Nfs.ycp src/ui.ycp
by mfilka＠svn2.opensuse.org 16 Feb '12

16 Feb '12

Author: mfilka Date: Thu Feb 16 14:22:19 2012 New Revision: 67465 URL: http://svn.opensuse.org/viewcvs/yast?rev=67465&view=rev Log: removed some dead code, whitespaces Modified: trunk/nfs-client/package/yast2-nfs-client.changes trunk/nfs-client/src/Nfs.ycp trunk/nfs-client/src/ui.ycp Modified: trunk/nfs-client/package/yast2-nfs-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/package/yast2-nfs-cli… ============================================================================== --- trunk/nfs-client/package/yast2-nfs-client.changes (original) +++ trunk/nfs-client/package/yast2-nfs-client.changes Thu Feb 16 14:22:19 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Feb 16 13:16:18 UTC 2012 - mfilka(a)suse.com + +- removed some dead code, whitespaces + +------------------------------------------------------------------- Thu Feb 16 12:44:04 UTC 2012 - mfilka(a)suse.com - autoinstallation fails to enable portmapper/rpcbind service - bnc#744357 Modified: trunk/nfs-client/src/Nfs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/src/Nfs.ycp?rev=67465… ============================================================================== --- trunk/nfs-client/src/Nfs.ycp (original) +++ trunk/nfs-client/src/Nfs.ycp Thu Feb 16 14:22:19 2012 @@ -82,7 +82,7 @@ list<string> created_dirs = []; boolean ReadNfs4 () { - return (SCR::Read(.sysconfig.nfs.NFS4_SUPPORT)=="yes"); + return (SCR::Read(.sysconfig.nfs.NFS4_SUPPORT)=="yes"); } string ReadIdmapd() { @@ -375,11 +375,6 @@ return false; } -/* if (size (nfs_entries) == 0) - { - // Service::Adjust ("nfs", "disable"); // what if autofs needs it? - }*/ - portmapper = FindPortmapper(); if (size (nfs_entries) != 0) { @@ -636,8 +631,8 @@ return true; } - /** - * Return required packages for auto-installation + /** + * Return required packages for auto-installation * @return map of packages to be installed and to be removed */ global define map AutoPackages() ``{ Modified: trunk/nfs-client/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/src/ui.ycp?rev=67465&… ============================================================================== --- trunk/nfs-client/src/ui.ycp (original) +++ trunk/nfs-client/src/ui.ycp Thu Feb 16 14:22:19 2012 @@ -129,7 +129,7 @@ /* Return convenient hostname (FaTE #302863) to be proposed * i.e. nfs + current domain (nfs. + suse.cz) - * @return string proposed hostname + * @return string proposed hostname */ define string ProposeHostname() { string ret = ""; @@ -586,7 +586,7 @@ EnableDisableButtons(); } - + void InitSettings( ) { CWMFirewallInterfaces::OpenFirewallInit (fw_cwm_widget, ""); @@ -594,16 +594,16 @@ UI::ChangeWidget( `id(`nfs4_domain), `Enabled, Nfs::nfs4_enabled != false); UI::ChangeWidget(`id(`nfs4_domain), `Value, Nfs::idmapd_domain); } - + void SaveFstabEntries( ) { Nfs::nfs_entries = nfs_entries; } - + void SaveSettings( map event ) { CWMFirewallInterfaces::OpenFirewallStore (fw_cwm_widget, "", event); - Nfs::nfs4_enabled = (boolean) UI::QueryWidget(`id(`enable_nfs4),`Value); + Nfs::nfs4_enabled = (boolean) UI::QueryWidget(`id(`enable_nfs4),`Value); Nfs::idmapd_domain = (string) UI::QueryWidget(`id(`nfs4_domain),`Value); } @@ -613,9 +613,6 @@ // handle the events, enable/disable the button, show the popup if button clicked if ( UI::WidgetExists(`id("_cwm_firewall_details")) && UI::WidgetExists(`id("_cwm_open_firewall")) ) CWMFirewallInterfaces::OpenFirewallHandle (fw_cwm_widget, "", $[ "ID" : widget ]); - /*changed = - true || // TODO: fw changed, #44106 - true; // TODO: nfs changed*/ if ( UI::WidgetExists(`id(`fstable)) ) entryno = (integer) UI::QueryWidget(`id(`fstable), `CurrentItem); @@ -719,7 +716,7 @@ do { - event = UI::WaitForEvent (); + event = UI::WaitForEvent (); ret = event["ID"]:nil; if (ret == `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] r67464 - /tags/stable-2_21_4/nfs-client/
by mfilka＠svn2.opensuse.org 16 Feb '12

16 Feb '12

Author: mfilka Date: Thu Feb 16 13:49:24 2012 New Revision: 67464 URL: http://svn.opensuse.org/viewcvs/yast?rev=67464&view=rev Log: Created tag stable-2_21_4 for nfs-client Added: tags/stable-2_21_4/nfs-client/ (props changed) - copied from r67463, trunk/nfs-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] r67463 - in /trunk/nfs-client: package/yast2-nfs-client.changes src/Nfs.ycp
by mfilka＠svn2.opensuse.org 16 Feb '12

16 Feb '12

Author: mfilka Date: Thu Feb 16 13:47:25 2012 New Revision: 67463 URL: http://svn.opensuse.org/viewcvs/yast?rev=67463&view=rev Log: autoinstallation fails to enable rpcbind / portmapper - bnc#744357 Modified: trunk/nfs-client/package/yast2-nfs-client.changes trunk/nfs-client/src/Nfs.ycp Modified: trunk/nfs-client/package/yast2-nfs-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/package/yast2-nfs-cli… ============================================================================== --- trunk/nfs-client/package/yast2-nfs-client.changes (original) +++ trunk/nfs-client/package/yast2-nfs-client.changes Thu Feb 16 13:47:25 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Feb 16 12:44:04 UTC 2012 - mfilka(a)suse.com + +- autoinstallation fails to enable portmapper/rpcbind service - bnc#744357 +- 2.21.4 + +------------------------------------------------------------------- Thu Feb 16 12:23:00 UTC 2012 - mfilka(a)suse.com - accepted comments from earlier review. Modified: trunk/nfs-client/src/Nfs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/src/Nfs.ycp?rev=67463… ============================================================================== --- trunk/nfs-client/src/Nfs.ycp (original) +++ trunk/nfs-client/src/Nfs.ycp Thu Feb 16 13:47:25 2012 @@ -380,6 +380,7 @@ // Service::Adjust ("nfs", "disable"); // what if autofs needs it? }*/ + portmapper = FindPortmapper(); if (size (nfs_entries) != 0) { Service::Enable( portmapper ); -- 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] r67462 - in /trunk/nfs-client: VERSION package/yast2-nfs-client.changes src/Nfs.ycp src/ui.ycp yast2-nfs-client.spec.in
by mfilka＠svn2.opensuse.org 16 Feb '12

16 Feb '12

Author: mfilka Date: Thu Feb 16 13:43:13 2012 New Revision: 67462 URL: http://svn.opensuse.org/viewcvs/yast?rev=67462&view=rev Log: Accepted comments from 2.21.3 review Modified: trunk/nfs-client/VERSION trunk/nfs-client/package/yast2-nfs-client.changes trunk/nfs-client/src/Nfs.ycp trunk/nfs-client/src/ui.ycp trunk/nfs-client/yast2-nfs-client.spec.in Modified: trunk/nfs-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/VERSION?rev=67462&r1=… ============================================================================== --- trunk/nfs-client/VERSION (original) +++ trunk/nfs-client/VERSION Thu Feb 16 13:43:13 2012 @@ -1 +1 @@ -2.21.3 +2.21.4 Modified: trunk/nfs-client/package/yast2-nfs-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/package/yast2-nfs-cli… ============================================================================== --- trunk/nfs-client/package/yast2-nfs-client.changes (original) +++ trunk/nfs-client/package/yast2-nfs-client.changes Thu Feb 16 13:43:13 2012 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Feb 16 12:23:00 UTC 2012 - mfilka(a)suse.com + +- accepted comments from earlier review. +- some formatting +- 2.21.4 + +------------------------------------------------------------------- Wed Feb 8 12:00:10 UTC 2012 - mfilka(a)suse.com - Base server hostname combobox on existing values - bnc#547983 Modified: trunk/nfs-client/src/Nfs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/src/Nfs.ycp?rev=67462… ============================================================================== --- trunk/nfs-client/src/Nfs.ycp (original) +++ trunk/nfs-client/src/Nfs.ycp Thu Feb 16 13:43:13 2012 @@ -137,22 +137,23 @@ } }); - //Backwards compatibility: with FaTE#302031, we support nfsv4 mounts - //thus we need to keep info on nfs version (v3 vs. v4) - //But older AY profiles might not contain this element - //so let's assume nfsv3 in that case (#395850) - if ( !haskey(s, "vfstype") ) - { - s["vfstype"] = "nfs"; - } else { - if (s["vfstype"]:"nfs" == "nfs4") - { - nfs4_enabled = true; - } - } + //Backwards compatibility: with FaTE#302031, we support nfsv4 mounts + //thus we need to keep info on nfs version (v3 vs. v4) + //But older AY profiles might not contain this element + //so let's assume nfsv3 in that case (#395850) + if ( !haskey(s, "vfstype") ) + { + s["vfstype"] = "nfs"; + } else { + if (s["vfstype"]:"nfs" == "nfs4") + { + nfs4_enabled = true; + } + } return s; }); + if (missing) { return false; @@ -305,10 +306,10 @@ Progress::set(progress_orig); portmapper = FindPortmapper(); - //There is neither rpcbind nor portmap + //There is neither rpcbind nor portmap if ( portmapper == "" ) { - //so let's install rpcbind (default since #423026) + //so let's install rpcbind (default since #423026) required_packages = add( required_packages, "rpcbind" ); portmapper = "rpcbind"; } Modified: trunk/nfs-client/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/src/ui.ycp?rev=67462&… ============================================================================== --- trunk/nfs-client/src/ui.ycp (original) +++ trunk/nfs-client/src/ui.ycp Thu Feb 16 13:43:13 2012 @@ -223,9 +223,7 @@ foreach( map nfs_entry, nfs_entries, { term couple = SpecToServPath( nfs_entry[ "spec"]:""); - string known_server = ""; - - known_server = couple[0]:""; + string known_server = couple[0]:""; if( !contains( servers, known_server)) servers = add( servers, known_server); Modified: trunk/nfs-client/yast2-nfs-client.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/yast2-nfs-client.spec… ============================================================================== --- trunk/nfs-client/yast2-nfs-client.spec.in (original) +++ trunk/nfs-client/yast2-nfs-client.spec.in Thu Feb 16 13:43:13 2012 @@ -21,6 +21,7 @@ BuildArch: noarch Summary: YaST2 - NFS Configuration +Url: http://en.opensuse.org/Portal:YaST %description The YaST2 component for configuration of NFS. NFS stands for network -- 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] r67461 - in /trunk/s390/src/clients: dasd.desktop zfcp.desktop
by aschnell＠svn2.opensuse.org 16 Feb '12

16 Feb '12

Author: aschnell Date: Thu Feb 16 12:36:37 2012 New Revision: 67461 URL: http://svn.opensuse.org/viewcvs/yast?rev=67461&view=rev Log: - unified desktop files Modified: trunk/s390/src/clients/dasd.desktop trunk/s390/src/clients/zfcp.desktop Modified: trunk/s390/src/clients/dasd.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/clients/dasd.desktop?re… ============================================================================== --- trunk/s390/src/clients/dasd.desktop (original) +++ trunk/s390/src/clients/dasd.desktop Thu Feb 16 12:36:37 2012 @@ -21,5 +21,5 @@ Exec=xdg-su -c "/sbin/yast2 dasd" Name=DASD -GenericName=Configure dasd +GenericName=Configure DASD StartupNotify=true Modified: trunk/s390/src/clients/zfcp.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/clients/zfcp.desktop?re… ============================================================================== --- trunk/s390/src/clients/zfcp.desktop (original) +++ trunk/s390/src/clients/zfcp.desktop Thu Feb 16 12:36:37 2012 @@ -20,6 +20,6 @@ Icon=yast-zfcp Exec=xdg-su -c "/sbin/yast2 zfcp" -Name=Zfcp -GenericName=Configure zfcp +Name=ZFCP +GenericName=Configure ZFCP StartupNotify=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] r67460 - /trunk/s390/src/clients/s390-disk-controller.ycp
by aschnell＠svn2.opensuse.org 16 Feb '12

16 Feb '12

Author: aschnell Date: Thu Feb 16 12:12:06 2012 New Revision: 67460 URL: http://svn.opensuse.org/viewcvs/yast?rev=67460&view=rev Log: - removed one of two return statements Modified: trunk/s390/src/clients/s390-disk-controller.ycp Modified: trunk/s390/src/clients/s390-disk-controller.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/src/clients/s390-disk-contr… ============================================================================== --- trunk/s390/src/clients/s390-disk-controller.ycp (original) +++ trunk/s390/src/clients/s390-disk-controller.ycp Thu Feb 16 12:12:06 2012 @@ -8,16 +8,9 @@ * * Main file for controller configuration. Uses all other files. */ - { - -/*** - * <h3>Configuration of controller</h3> - */ - textdomain "s390"; -/* The main () */ y2milestone ("----------------------------------------"); y2milestone ("S/390 Controller module started"); @@ -94,15 +87,11 @@ } UI::CloseDialog(); -return ret; y2debug("ret=%1", ret); -/* Finish */ y2milestone("S/390 controller module 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] r67459 - /trunk/s390/src/modules/DASDController.ycp
by aschnell＠svn2.opensuse.org 16 Feb '12

16 Feb '12

Author: aschnell Date: Thu Feb 16 11:42:21 2012 New Revision: 67459 URL: http://svn.opensuse.org/viewcvs/yast?rev=67459&view=rev Log: - removed unneeded scope operator 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 Thu Feb 16 11:42:21 2012 @@ -279,7 +279,7 @@ GetDeviceIndex(string channel) { integer ret = nil; - foreach(integer index , map<string, any> d, DASDController::devices, { + foreach(integer index , map<string, any> d, devices, { if (d["channel"]:"0.0.0000" == channel) ret = index; }); -- 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] r67458 - /trunk/s390/src/modules/DASDController.ycp
by aschnell＠svn2.opensuse.org 15 Feb '12

15 Feb '12

Author: aschnell Date: Wed Feb 15 18:24:56 2012 New Revision: 67458 URL: http://svn.opensuse.org/viewcvs/yast?rev=67458&view=rev Log: - fixed mode queries in Read and Write 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 Wed Feb 15 18:24:56 2012 @@ -124,13 +124,17 @@ { ProbeDisks(); - if (Mode::config()) // TODO + if (!Mode::normal()) { + devices = filter(integer index, map<string, any> d, devices, { + return d["resource", "io", 0, "active"]:false; + }); + devices = mapmap(integer index, map<string, any> d, devices, { - d["format"] = d["format"]:false; - d["diag"] = d["diag"]:false; - return $[ index : d ]; - }); + d["format"] = d["format"]:false; + d["diag"] = d["diag"]:false; + return $[ index : d ]; + }); } disk_configured = false; @@ -144,50 +148,50 @@ */ global boolean Write() { - if (Mode::config()) // TODO + if (!Mode::normal()) { - 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); + list<string> to_format = []; - if (format) - { - string dev_name = GetDeviceName(channel); - if (dev_name != nil) - to_format = add(to_format, dev_name); - } - }); + 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); + y2milestone ("Disks to format: %1", to_format); - if (!isempty(to_format)) - FormatDisks(to_format, 8, true); + if (!isempty(to_format)) + FormatDisks(to_format, 8, true); } - if (disk_configured && Mode::normal ()) + if (!Mode::installation()) { - // popup label - UI::OpenDialog(`Label(_("Running mkinitrd and zipl."))); + if (disk_configured) + { + // 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); + string command = "/sbin/mkinitrd && /sbin/zipl"; + y2milestone("Running command %1", command); + any ret = SCR::Execute(.target.bash, command); + y2milestone ("Exit code: %1", ret); - UI::CloseDialog(); - } - else - { - y2milestone ("No new disk configured"); + UI::CloseDialog(); + } } return true; } + /** * Get all controller settings from the first parameter * (For use by autoinstallation.) @@ -198,7 +202,7 @@ { integer index = -1; devices = listmap (map<string, any> d, settings["devices"]:[], { - index = index + 1; + index = index + 1; d = filter(string k, any v, d, { return contains([ "channel", "format", "diag" ], k); @@ -588,7 +592,7 @@ string line = (string) SCR::Read(.process.read_line, process_id); if (line == nil) break; - + integer siz = tointeger (line); if (siz == 0) siz = 999999999; -- 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] r67457 - /trunk/s390/src/modules/DASDController.ycp
by aschnell＠svn2.opensuse.org 15 Feb '12

15 Feb '12

Author: aschnell Date: Wed Feb 15 18:00:00 2012 New Revision: 67457 URL: http://svn.opensuse.org/viewcvs/yast?rev=67457&view=rev Log: - added popup while running mkinitrd and zipl 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 Wed Feb 15 18:00:00 2012 @@ -37,6 +37,9 @@ global boolean GetModified(); +/** + * Have DASDs been configured so that mkinitrd and zipl need to be run? + */ boolean disk_configured = false; @@ -167,10 +170,15 @@ 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); + + UI::CloseDialog(); } 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] r67456 - in /trunk/s390/testsuite/tests: S390.out S390.ycp
by aschnell＠svn2.opensuse.org 15 Feb '12

15 Feb '12

Author: aschnell Date: Wed Feb 15 17:01:51 2012 New Revision: 67456 URL: http://svn.opensuse.org/viewcvs/yast?rev=67456&view=rev Log: - adapted testsuite Modified: trunk/s390/testsuite/tests/S390.out trunk/s390/testsuite/tests/S390.ycp Modified: trunk/s390/testsuite/tests/S390.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/testsuite/tests/S390.out?re… ============================================================================== --- trunk/s390/testsuite/tests/S390.out (original) +++ trunk/s390/testsuite/tests/S390.out Wed Feb 15 17:01:51 2012 @@ -1,2 +1,2 @@ -Dump DASDController::Modified +Dump DASDController::GetModified Return false Modified: trunk/s390/testsuite/tests/S390.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/testsuite/tests/S390.ycp?re… ============================================================================== --- trunk/s390/testsuite/tests/S390.ycp (original) +++ trunk/s390/testsuite/tests/S390.ycp Wed Feb 15 17:01:51 2012 @@ -7,7 +7,7 @@ import "DASDController"; -DUMP("DASDController::Modified"); -TEST(``(DASDController::Modified()), [], nil); +DUMP("DASDController::GetModified"); +TEST(``(DASDController::GetModified()), [], nil); } -- 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] r67455 - /trunk/s390/yast2-s390.spec.in
by aschnell＠svn2.opensuse.org 15 Feb '12

15 Feb '12

Author: aschnell Date: Wed Feb 15 16:58:11 2012 New Revision: 67455 URL: http://svn.opensuse.org/viewcvs/yast?rev=67455&view=rev Log: - updated build-requires Modified: trunk/s390/yast2-s390.spec.in Modified: trunk/s390/yast2-s390.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/yast2-s390.spec.in?rev=6745… ============================================================================== --- trunk/s390/yast2-s390.spec.in (original) +++ trunk/s390/yast2-s390.spec.in Wed Feb 15 16:58:11 2012 @@ -4,7 +4,7 @@ Group: System/YaST License: GPL-2.0+ BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files -BuildRequires: yast2 yast2-devtools yast2-testsuite +BuildRequires: yast2 yast2-devtools yast2-testsuite yast2-users yast2-bootloader ExclusiveArch: s390 s390x Requires: yast2 s390-tools -- 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] r67454 - /trunk/ruby-bindings/src/ruby/YRuby.cc
by jreidinger＠svn2.opensuse.org 15 Feb '12

15 Feb '12

Author: jreidinger Date: Wed Feb 15 16:53:47 2012 New Revision: 67454 URL: http://svn.opensuse.org/viewcvs/yast?rev=67454&view=rev Log: and implement injection of last exception message Modified: trunk/ruby-bindings/src/ruby/YRuby.cc Modified: trunk/ruby-bindings/src/ruby/YRuby.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/src/ruby/YRuby.cc?… ============================================================================== --- trunk/ruby-bindings/src/ruby/YRuby.cc (original) +++ trunk/ruby-bindings/src/ruby/YRuby.cc Wed Feb 15 16:53:47 2012 @@ -56,6 +56,17 @@ #include "Y2RubyTypeConv.h" +void inject_last_exception_method(VALUE& module,const string& message, const string& module_name) +{ + //doing injection from C++ is quite complex, but we have eval, so we can do it in ruby :) + string code("module "); + code += module_name; + code += "\ndef self.last_exception\n'"; + code += message; + code += "'\nend\nend"; + rb_funcall(module, rb_intern("eval"), 1, rb_str_new2(code.c_str())); +} + static void prependModulePath() { YCPPathSearch::initialize (); @@ -248,6 +259,7 @@ { return YCPString(StringValuePtr(reason)); } + inject_last_exception_method(module,StringValuePtr(reason),module_name); return YCPVoid(); } 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] r67453 - /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:51:53 2012 New Revision: 67453 URL: http://svn.opensuse.org/viewcvs/yast?rev=67453&view=rev Log: make test really fail if it doesn't return what we want 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:51:53 2012 @@ -8,10 +8,13 @@ { result = tostring(InRuby::last_exception()); y2milestone("result: %1", result); + if(result != "Wow exception!") + return false; } else { y2error("exception completely ignored result: %1",result); + return false; } 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] r67452 - /trunk/ruby-bindings/src/ruby/YRuby.cc
by jreidinger＠svn2.opensuse.org 15 Feb '12

15 Feb '12

Author: jreidinger Date: Wed Feb 15 16:31:10 2012 New Revision: 67452 URL: http://svn.opensuse.org/viewcvs/yast?rev=67452&view=rev Log: fix memory leak in ruby bindings Modified: trunk/ruby-bindings/src/ruby/YRuby.cc Modified: trunk/ruby-bindings/src/ruby/YRuby.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/src/ruby/YRuby.cc?… ============================================================================== --- trunk/ruby-bindings/src/ruby/YRuby.cc (original) +++ trunk/ruby-bindings/src/ruby/YRuby.cc Wed Feb 15 16:31:10 2012 @@ -242,6 +242,7 @@ char* tmp = fmtstr("%s\n\t%s", StringValuePtr(reason), StringValuePtr(backtrace)); y2error("%s.%s failed\n%s", module_name.c_str(), function.c_str(), tmp); + free(tmp); //workaround if last_exception failed, then return always string with message if(function == "last_exception") //TODO constantify last_exception { -- 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] r67451 - /trunk/ruby-bindings/src/ruby/YRuby.cc
by jreidinger＠svn2.opensuse.org 15 Feb '12

15 Feb '12

Author: jreidinger Date: Wed Feb 15 16:26:08 2012 New Revision: 67451 URL: http://svn.opensuse.org/viewcvs/yast?rev=67451&view=rev Log: ensure that even if exception is raised we return correct result. Ensure also that for last_exception if exception is called, we still return string with message Modified: trunk/ruby-bindings/src/ruby/YRuby.cc Modified: trunk/ruby-bindings/src/ruby/YRuby.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/src/ruby/YRuby.cc?… ============================================================================== --- trunk/ruby-bindings/src/ruby/YRuby.cc (original) +++ trunk/ruby-bindings/src/ruby/YRuby.cc Wed Feb 15 16:26:08 2012 @@ -236,12 +236,18 @@ if (error) { VALUE exception = rb_gv_get("$!"); /* get last exception */ - VALUE reason = rb_funcall(exception, rb_intern("to_s"), 0 ); + VALUE reason = rb_funcall(exception, rb_intern("message"), 0 ); VALUE trace = rb_gv_get("$@"); /* get last exception trace */ VALUE backtrace = rb_funcall(trace, rb_intern("join"), 1, rb_str_new("\n\t", 2)); char* tmp = fmtstr("%s\n\t%s", StringValuePtr(reason), StringValuePtr(backtrace)); y2error("%s.%s failed\n%s", module_name.c_str(), function.c_str(), tmp); + //workaround if last_exception failed, then return always string with message + if(function == "last_exception") //TODO constantify last_exception + { + return YCPString(StringValuePtr(reason)); + } + return YCPVoid(); } else { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0