April 2012 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r67874 - /trunk/gtk/yast2-gtk.spec.in
by tgoettlicher＠svn2.opensuse.org 10 Apr '12

10 Apr '12

Author: tgoettlicher Date: Tue Apr 10 15:43:45 2012 New Revision: 67874 URL: http://svn.opensuse.org/viewcvs/yast?rev=67874&view=rev Log: - BuildRequire libxcrypt-devel only for < 12.2 Modified: trunk/gtk/yast2-gtk.spec.in Modified: trunk/gtk/yast2-gtk.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/yast2-gtk.spec.in?rev=67874&… ============================================================================== --- trunk/gtk/yast2-gtk.spec.in (original) +++ trunk/gtk/yast2-gtk.spec.in Tue Apr 10 15:43:45 2012 @@ -13,6 +13,9 @@ BuildRequires: yast2-devtools >= 2.16.3 BuildRequires: yast2-libyui-devel >= 2.18.8 BuildRequires: libzypp-devel >= 6.3.0 +%if 0%{?suse_version} < 1220 +uildRequires: libxcrypt-devel +%endif Requires: gtk3 Requires: yast2-libyui >= 2.18.8 Requires: yast2_theme >= 2.16.1 -- 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] r67873 - in /trunk/qt: VERSION.cmake package/yast2-qt.changes yast2-qt.spec.in
by tgoettlicher＠svn2.opensuse.org 10 Apr '12

10 Apr '12

Author: tgoettlicher Date: Tue Apr 10 15:41:59 2012 New Revision: 67873 URL: http://svn.opensuse.org/viewcvs/yast?rev=67873&view=rev Log: BuildRequire libxcrypt-devel only for < 12.2 Modified: trunk/qt/VERSION.cmake trunk/qt/package/yast2-qt.changes trunk/qt/yast2-qt.spec.in Modified: trunk/qt/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/VERSION.cmake?rev=67873&r1=67… ============================================================================== --- trunk/qt/VERSION.cmake (original) +++ trunk/qt/VERSION.cmake Tue Apr 10 15:41:59 2012 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "22") -SET(VERSION_PATCH "4") +SET(VERSION_PATCH "5") 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 Tue Apr 10 15:41:59 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Apr 10 15:40:58 CEST 2012 - tgoettlicher(a)suse.de + +- BuildRequire libxcrypt-devel only for < 12.2 +- Version: 2.22.5 + +------------------------------------------------------------------- Thu Feb 23 15:12:05 CET 2012 - tgoettlicher(a)suse.de - Fixed selection Table widget (bnc#746156) Modified: trunk/qt/yast2-qt.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/yast2-qt.spec.in?rev=67873&r1… ============================================================================== --- trunk/qt/yast2-qt.spec.in (original) +++ trunk/qt/yast2-qt.spec.in Tue Apr 10 15:41:59 2012 @@ -14,6 +14,9 @@ BuildRequires: sgml-skel BuildRequires: update-desktop-files BuildRequires: cmake +%if 0%{?suse_version} < 1220 +BuildRequires: libxcrypt-devel +%endif %requires_ge libqt4 Summary: YaST2 - Graphical User Interface -- 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] r67872 - in /trunk: network/ network/agents/ network/package/ network/src/clients/ network/src/config/ network/src/modules/ network/testsuite/tests/ proxy/ proxy/config/ proxy/package/ proxy/src/ p...
by mvidner＠svn2.opensuse.org 10 Apr '12

10 Apr '12

Author: mvidner Date: Tue Apr 10 15:35:49 2012 New Revision: 67872 URL: http://svn.opensuse.org/viewcvs/yast?rev=67872&view=rev Log: Moving HTTP proxy (client) configuration to a standalone package. yast2-network is big enough already; yast2-proxy is independent of it Added: trunk/proxy/ trunk/proxy/MAINTAINER trunk/proxy/Makefile.cvs trunk/proxy/RPMNAME trunk/proxy/VERSION trunk/proxy/config/ trunk/proxy/config/Makefile.am trunk/proxy/config/cfg_proxy.scr - copied unchanged from r67871, trunk/network/agents/cfg_proxy.scr trunk/proxy/config/proxy.desktop - copied unchanged from r67871, trunk/network/src/config/proxy.desktop trunk/proxy/config/proxy.rnc - copied unchanged from r67871, trunk/network/src/config/proxy.rnc trunk/proxy/config/root_curlrc.scr - copied unchanged from r67871, trunk/network/agents/root_curlrc.scr trunk/proxy/config/root_wgetrc.scr - copied unchanged from r67871, trunk/network/agents/root_wgetrc.scr trunk/proxy/configure.in.in trunk/proxy/package/ trunk/proxy/package/yast2-proxy.changes trunk/proxy/src/ trunk/proxy/src/Makefile.am trunk/proxy/src/clients/ trunk/proxy/src/clients/Makefile.am trunk/proxy/src/clients/proxy.ycp - copied unchanged from r67871, trunk/network/src/clients/proxy.ycp trunk/proxy/src/clients/proxy_auto.ycp - copied unchanged from r67871, trunk/network/src/clients/proxy_auto.ycp trunk/proxy/src/clients/proxy_proposal.ycp - copied unchanged from r67871, trunk/network/src/clients/proxy_proposal.ycp trunk/proxy/src/modules/ trunk/proxy/src/modules/Makefile.am trunk/proxy/src/modules/Proxy.ycp - copied unchanged from r67871, trunk/network/src/modules/Proxy.ycp trunk/proxy/testsuite/ trunk/proxy/testsuite/Makefile.am trunk/proxy/testsuite/tests/ trunk/proxy/testsuite/tests/Proxy.err - copied unchanged from r67871, trunk/network/testsuite/tests/Proxy.err trunk/proxy/testsuite/tests/Proxy.out - copied unchanged from r67871, trunk/network/testsuite/tests/Proxy.out trunk/proxy/testsuite/tests/Proxy.ycp - copied unchanged from r67871, trunk/network/testsuite/tests/Proxy.ycp trunk/proxy/yast2-proxy.spec.in Removed: trunk/network/agents/cfg_proxy.scr trunk/network/agents/root_curlrc.scr trunk/network/agents/root_wgetrc.scr trunk/network/src/clients/proxy.ycp trunk/network/src/clients/proxy_auto.ycp trunk/network/src/clients/proxy_proposal.ycp trunk/network/src/config/proxy.desktop trunk/network/src/config/proxy.rnc trunk/network/src/modules/Proxy.ycp trunk/network/testsuite/tests/Proxy.err trunk/network/testsuite/tests/Proxy.out trunk/network/testsuite/tests/Proxy.ycp Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/config/Makefile.am trunk/network/yast2-network.spec.in Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=67872&r1=678… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Tue Apr 10 15:35:49 2012 @@ -1 +1 @@ -2.22.5 +2.22.6 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Tue Apr 10 15:35:49 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Apr 10 14:45:17 CEST 2012 - mvidner(a)suse.cz + +- Moved proxy client config to a new package yast2-proxy.rpm +- 2.22.6 + +------------------------------------------------------------------- Thu Mar 29 15:26:35 CEST 2012 - jsuchome(a)suse.cz - merged proofread texts Modified: trunk/network/src/config/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/config/Makefile.am?r… ============================================================================== --- trunk/network/src/config/Makefile.am (original) +++ trunk/network/src/config/Makefile.am Tue Apr 10 15:35:49 2012 @@ -1,11 +1,9 @@ # Makefile.am for source/network/src/config -# $Id$ desktop_DATA = $(wildcard *.desktop) rncdir = $(schemadir)/autoyast/rnc rnc_DATA = networking.rnc\ - host.rnc\ - proxy.rnc + host.rnc EXTRA_DIST = $(desktop_DATA) $(rnc_DATA) Modified: trunk/network/yast2-network.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/yast2-network.spec.in?re… ============================================================================== --- trunk/network/yast2-network.spec.in (original) +++ trunk/network/yast2-network.spec.in Tue Apr 10 15:35:49 2012 @@ -89,7 +89,6 @@ @agentdir@/ag_udev_persistent @schemadir@/autoyast/rnc/networking.rnc @schemadir@/autoyast/rnc/host.rnc -@schemadir@/autoyast/rnc/proxy.rnc %dir @docdir@ @docdir@/COPYING Added: trunk/proxy/MAINTAINER URL: http://svn.opensuse.org/viewcvs/yast/trunk/proxy/MAINTAINER?rev=67872&view=… ============================================================================== --- trunk/proxy/MAINTAINER (added) +++ trunk/proxy/MAINTAINER Tue Apr 10 15:35:49 2012 @@ -0,0 +1 @@ +Martin Vidner <mvidner(a)suse.cz> Added: trunk/proxy/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/proxy/Makefile.cvs?rev=67872&vie… ============================================================================== --- trunk/proxy/Makefile.cvs (added) +++ trunk/proxy/Makefile.cvs Tue Apr 10 15:35:49 2012 @@ -0,0 +1,23 @@ +# +# Makefile.cvs +# + +LIB = $(shell y2tool get-lib) + +PREFIX = /usr + +configure: all + ./configure --prefix=$(PREFIX) --libdir=$(PREFIX)/$(LIB) + +all: + y2tool y2autoconf + y2tool y2automake + autoreconf --force --install + +install: configure + make + make install + +reconf: all + ./config.status --recheck + ./config.status Added: trunk/proxy/RPMNAME URL: http://svn.opensuse.org/viewcvs/yast/trunk/proxy/RPMNAME?rev=67872&view=auto ============================================================================== --- trunk/proxy/RPMNAME (added) +++ trunk/proxy/RPMNAME Tue Apr 10 15:35:49 2012 @@ -0,0 +1 @@ +yast2-proxy Added: trunk/proxy/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/proxy/VERSION?rev=67872&view=auto ============================================================================== --- trunk/proxy/VERSION (added) +++ trunk/proxy/VERSION Tue Apr 10 15:35:49 2012 @@ -0,0 +1 @@ +2.22.0 Added: trunk/proxy/config/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/proxy/config/Makefile.am?rev=678… ============================================================================== --- trunk/proxy/config/Makefile.am (added) +++ trunk/proxy/config/Makefile.am Tue Apr 10 15:35:49 2012 @@ -0,0 +1,8 @@ +desktop_DATA = proxy.desktop + +rncdir = $(schemadir)/autoyast/rnc +rnc_DATA = proxy.rnc + +scrconf_DATA = $(wildcard *.scr) + +EXTRA_DIST = $(desktop_DATA) $(rnc_DATA) $(scrconf_DATA) Added: trunk/proxy/configure.in.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/proxy/configure.in.in?rev=67872&… ============================================================================== --- trunk/proxy/configure.in.in (added) +++ trunk/proxy/configure.in.in Tue Apr 10 15:35:49 2012 @@ -0,0 +1,12 @@ +## YCP module configure.in.in + +## Initialize +@YAST2-INIT-COMMON@ +@YAST2-INIT-YCP@ + +## some common checks +@YAST2-CHECKS-COMMON@ +@YAST2-CHECKS-YCP@ + +## and generate the output... +@YAST2-OUTPUT@ Added: trunk/proxy/package/yast2-proxy.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/proxy/package/yast2-proxy.change… ============================================================================== --- trunk/proxy/package/yast2-proxy.changes (added) +++ trunk/proxy/package/yast2-proxy.changes Tue Apr 10 15:35:49 2012 @@ -0,0 +1,6 @@ +------------------------------------------------------------------- +Tue Apr 10 14:49:56 CEST 2012 - mvidner(a)suse.cz + +- Split off yast2-network +- 2.22.0 + Added: trunk/proxy/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/proxy/src/Makefile.am?rev=67872&… ============================================================================== --- trunk/proxy/src/Makefile.am (added) +++ trunk/proxy/src/Makefile.am Tue Apr 10 15:35:49 2012 @@ -0,0 +1 @@ +SUBDIRS = clients modules Added: trunk/proxy/src/clients/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/proxy/src/clients/Makefile.am?re… ============================================================================== --- trunk/proxy/src/clients/Makefile.am (added) +++ trunk/proxy/src/clients/Makefile.am Tue Apr 10 15:35:49 2012 @@ -0,0 +1,2 @@ +client_DATA = $(wildcard proxy*.ycp) +EXTRA_DIST = $(client_DATA) Added: trunk/proxy/src/modules/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/proxy/src/modules/Makefile.am?re… ============================================================================== --- trunk/proxy/src/modules/Makefile.am (added) +++ trunk/proxy/src/modules/Makefile.am Tue Apr 10 15:35:49 2012 @@ -0,0 +1,5 @@ +module_DATA = Proxy.ycp +EXTRA_DIST = $(module_DATA) + +YCPCFLAGS = +include $(top_srcdir)/Makefile.am.common Added: trunk/proxy/testsuite/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/proxy/testsuite/Makefile.am?rev=… ============================================================================== --- trunk/proxy/testsuite/Makefile.am (added) +++ trunk/proxy/testsuite/Makefile.am Tue Apr 10 15:35:49 2012 @@ -0,0 +1,21 @@ +# +# Makefile.am for .../testsuite +# +# Do not edit this file (Makefile.am) as it will be overwritten! +# + +AUTOMAKE_OPTIONS = dejagnu +EXTRA_DIST = $(wildcard tests/*.out) $(wildcard tests/*.err) $(wildcard tests/*.ycp) $(wildcard tests/*.yh) + +testsuite_prepare = @ydatadir@/testsuite/Makefile.testsuite + +all-local: $(testsuite_prepare) + make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) + +clean-local: $(testsuite_prepare) + make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) clean + +check-local: $(testsuite_prepare) + make -f $(testsuite_prepare) RPMNAME=$(RPMNAME) srcdir=$(srcdir) check + +# EOF Added: trunk/proxy/yast2-proxy.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/proxy/yast2-proxy.spec.in?rev=67… ============================================================================== --- trunk/proxy/yast2-proxy.spec.in (added) +++ trunk/proxy/yast2-proxy.spec.in Tue Apr 10 15:35:49 2012 @@ -0,0 +1,40 @@ +@HEADER-COMMENT@ + +@HEADER@ +Group: System/YaST +License: GPL v2 or later +# should be required by devtools +BuildRequires: pkgconfig perl-XML-Writer rpm +BuildRequires: update-desktop-files +BuildRequires: yast2-devtools yast2-testsuite + +BuildRequires: yast2 +Requires: yast2 + +PreReq: /bin/rm + +Summary: YaST2 - Proxy Configuration + +%description +This package contains the YaST2 component for proxy configuration. + +@PREP@ + +@BUILD@ + +@INSTALL@ + +@CLEAN@ + +%files +%defattr(-,root,root) +@clientdir@/*.ycp +@moduledir@/*.ycp +@moduledir@/*.ybc +@desktopdir@/*.desktop +@scrconfdir@/*.scr +@schemadir@/autoyast/rnc/proxy.rnc + +%dir @docdir@ +@docdir@/COPYING +%readme @docdir@/README -- 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] r67871 - /tags/stable-2_22_0/tune/
by lslezak＠svn2.opensuse.org 10 Apr '12

10 Apr '12

Author: lslezak Date: Tue Apr 10 10:42:25 2012 New Revision: 67871 URL: http://svn.opensuse.org/viewcvs/yast?rev=67871&view=rev Log: Created tag stable-2_22_0 for tune Added: tags/stable-2_22_0/tune/ - copied from r67870, trunk/tune/ -- 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] r67870 - in /trunk/tune: VERSION hwinfo/src/system_settings_dialogs.ycp package/yast2-tune.changes
by lslezak＠svn2.opensuse.org 10 Apr '12

10 Apr '12

Author: lslezak Date: Tue Apr 10 10:42:16 2012 New Revision: 67870 URL: http://svn.opensuse.org/viewcvs/yast?rev=67870&view=rev Log: - fixed comment for translators (bnc#756202) - 2.22.0 Modified: trunk/tune/VERSION trunk/tune/hwinfo/src/system_settings_dialogs.ycp trunk/tune/package/yast2-tune.changes Modified: trunk/tune/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/tune/VERSION?rev=67870&r1=67869&… ============================================================================== --- trunk/tune/VERSION (original) +++ trunk/tune/VERSION Tue Apr 10 10:42:16 2012 @@ -1 +1 @@ -2.21.3 +2.22.0 Modified: trunk/tune/hwinfo/src/system_settings_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/tune/hwinfo/src/system_settings_… ============================================================================== --- trunk/tune/hwinfo/src/system_settings_dialogs.ycp (original) +++ trunk/tune/hwinfo/src/system_settings_dialogs.ycp Tue Apr 10 10:42:16 2012 @@ -98,7 +98,7 @@ "handle" : HandleElevatorSettings, "init" : InitElevatorSettings, "store" : StoreElevatorSettings, - // help text for the scheduler widget, do not translate 'cfg' + // help text for the scheduler widget, do not translate 'cfq' "help" : _("<big>Global I/O Scheduler</big> Select the algorithm which orders and sends commands to disk devices. This is a global option, it will be used for all disk devices in the Modified: trunk/tune/package/yast2-tune.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/tune/package/yast2-tune.changes?… ============================================================================== --- trunk/tune/package/yast2-tune.changes (original) +++ trunk/tune/package/yast2-tune.changes Tue Apr 10 10:42:16 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Apr 10 08:39:17 UTC 2012 - lslezak(a)suse.cz + +- fixed comment for translators (bnc#756202) +- 2.22.0 + +------------------------------------------------------------------- Thu Mar 29 16:43:33 CEST 2012 - jsuchome(a)suse.cz - merged proofread texts -- 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] r67869 - /trunk/ruby-bindings/MAINTAINER
by jreidinger＠svn2.opensuse.org 05 Apr '12

05 Apr '12

Author: jreidinger Date: Thu Apr 5 15:28:02 2012 New Revision: 67869 URL: http://svn.opensuse.org/viewcvs/yast?rev=67869&view=rev Log: officially change maintainer of ruby bindings Modified: trunk/ruby-bindings/MAINTAINER Modified: trunk/ruby-bindings/MAINTAINER URL: http://svn.opensuse.org/viewcvs/yast/trunk/ruby-bindings/MAINTAINER?rev=678… ============================================================================== --- trunk/ruby-bindings/MAINTAINER (original) +++ trunk/ruby-bindings/MAINTAINER Thu Apr 5 15:28:02 2012 @@ -1,2 +1,2 @@ -Duncan Mac-Vicar <dmacvicar(a)suse.de> +Josef Reidinger <jreidinger(a)suse.cz> -- 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] r67868 - /tags/stable-2_22_2/wagon/
by lslezak＠svn2.opensuse.org 05 Apr '12

05 Apr '12

Author: lslezak Date: Thu Apr 5 15:07:44 2012 New Revision: 67868 URL: http://svn.opensuse.org/viewcvs/yast?rev=67868&view=rev Log: Created tag stable-2_22_2 for wagon Added: tags/stable-2_22_2/wagon/ (props changed) - copied from r67867, trunk/wagon/ -- 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] r67867 - in /trunk/wagon: VERSION package/yast2-wagon.changes src/clients/wagon_congratulate.ycp
by lslezak＠svn2.opensuse.org 05 Apr '12

05 Apr '12

Author: lslezak Date: Thu Apr 5 15:07:37 2012 New Revision: 67867 URL: http://svn.opensuse.org/viewcvs/yast?rev=67867&view=rev Log: - fixes in helptexts (bnc#755532) - 2.22.2 Modified: trunk/wagon/VERSION trunk/wagon/package/yast2-wagon.changes trunk/wagon/src/clients/wagon_congratulate.ycp Modified: trunk/wagon/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/VERSION?rev=67867&r1=67866… ============================================================================== --- trunk/wagon/VERSION (original) +++ trunk/wagon/VERSION Thu Apr 5 15:07:37 2012 @@ -1 +1 @@ -2.22.1 +2.22.2 Modified: trunk/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/package/yast2-wagon.change… ============================================================================== --- trunk/wagon/package/yast2-wagon.changes (original) +++ trunk/wagon/package/yast2-wagon.changes Thu Apr 5 15:07:37 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Apr 5 12:19:35 UTC 2012 - lslezak(a)suse.cz + +- fixes in helptexts (bnc#755532) +- 2.22.2 + +------------------------------------------------------------------- Thu Mar 29 16:27:31 CEST 2012 - jsuchome(a)suse.cz - merged proofread texts Modified: trunk/wagon/src/clients/wagon_congratulate.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/clients/wagon_congratu… ============================================================================== --- trunk/wagon/src/clients/wagon_congratulate.ycp (original) +++ trunk/wagon/src/clients/wagon_congratulate.ycp Thu Apr 5 15:07:37 2012 @@ -35,15 +35,15 @@ if (text == nil || text == "") { y2warning ("Using fallback migration_congratulate text"); - text = - _("Congratulations! + // translators: %1 is a URL, e.g. http://www.suse.com + text = sformat(_("Congratulations! You have successfully finished the on-line migration. The whole system has been upgraded. It should be rebooted as soon as possible. -Please visit us at http://www.novell.com/linux/. +Please visit us at %1. Have a nice day! Your SUSE Linux Team -"); +"), "http://www.suse.com"); } term contents = `VBox ( @@ -60,7 +60,7 @@ ); string help = _("Finish will close the migration. -Restart the system as soon as possible. +Restart the system as soon as possible. "); Wizard::SetContents (caption, contents, help, -- 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] r67866 - in /trunk/s390: package/yast2-s390.changes src/dasd/dialogs.ycp
by aschnell＠svn2.opensuse.org 05 Apr '12

05 Apr '12

Author: aschnell Date: Thu Apr 5 14:59:09 2012 New Revision: 67866 URL: http://svn.opensuse.org/viewcvs/yast?rev=67866&view=rev Log: - added context menu to DASD module - allow to change diag and format setting for DASDs in config mode Modified: trunk/s390/package/yast2-s390.changes trunk/s390/src/dasd/dialogs.ycp Modified: trunk/s390/package/yast2-s390.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/s390/package/yast2-s390.changes?… ============================================================================== --- trunk/s390/package/yast2-s390.changes (original) +++ trunk/s390/package/yast2-s390.changes Thu Apr 5 14:59:09 2012 @@ -1,6 +1,8 @@ ------------------------------------------------------------------- Thu Apr 05 11:40:27 CEST 2012 - aschnell(a)suse.de +- added context menu to DASD module +- allow to change diag and format setting for DASDs in config mode - do not show partition info for unformatted DASDs ------------------------------------------------------------------- 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 Apr 5 14:59:09 2012 @@ -18,6 +18,9 @@ import "Sequencer"; import "Wizard"; import "String"; + import "Integer"; + import "Event"; + import "ContextMenu"; include "s390/dasd/helps.ycp"; @@ -115,6 +118,206 @@ } + list<term> + PossibleActions() + { + if (!Mode::config()) + { + return [ + // menu button id + `item(`id(`activate), _("&Activate")), + // menu button id + `item(`id(`deactivate), _("&Deactivate")), + // menu button id + `item(`id(`diag_on), _("Set DIAG O&n")), + // menu button id + `item(`id(`diag_off), _("Set DIAG O&ff")), + // menu button id + `item(`id(`format), _("&Format")) + ]; + } + else + { + return [ + // menu button id + `item(`id(`diag_on), _("Set DIAG O&n")), + // menu button id + `item(`id(`diag_off), _("Set DIAG O&ff")), + // menu button id + `item(`id(`format_on), _("Set Format On")), + // menu button id + `item(`id(`format_off), _("Set Format Off")) + ]; + } + } + + + boolean + PerformAction(symbol action) + { + list<integer> selected = ListSelectedDASD(); + if (isempty(selected)) + { + // error popup message + Popup::Message (_("No disk selected.")); + return false; + } + + if (!Mode::config()) + { + switch (action) + { + case `activate: + case `deactivate: + { + boolean value = action == `activate; + + foreach (integer id, selected, { + string channel = DASDController::devices[id, "channel"]:""; + boolean diag = DASDController::diag[channel]:false; + if (value) + DASDController::ActivateDisk(channel, diag); + else + DASDController::DeactivateDisk(channel, diag); + }); + DASDController::ProbeDisks(); + + return true; + } + + case `diag_on: + case `diag_off: + { + boolean value = action == `diag_on; + + foreach (integer id, selected, { + string channel = DASDController::devices[id, "channel"]:""; + boolean active = DASDController::devices[id, "resource", "io", 0, "active"]:false; + DASDController::diag[channel] = value; + if (active) + DASDController::ActivateDisk(channel, value); + }); + DASDController::ProbeDisks(); + + return true; + } + + case `format: + { + // check if disks are R/W and active + string problem = ""; + foreach (integer id, selected, { + boolean active = DASDController::devices[id, "resource", "io", 0, "active"]:false; + string access = DASDController::devices[id, "resource", "io", 0, "mode"]:"ro"; + if (!active) + { + // error report, %1 is device identification + problem = sformat(_("Disk %1 is not active."), + DASDController::devices[id, "channel"]:""); + } + else if (access != "rw") + { + // error report, %1 is device identification + problem = sformat(_("Disk %1 is not accessible for writing."), + DASDController::devices[id, "channel"]:""); + } + }); + if (!isempty(problem)) + { + Popup::Message(problem); + return false; + } + + integer par = Integer::Min([ size(selected), 8 ]); + + boolean cancel = false; + UI::OpenDialog(`VBox( + `IntField(`id (`par), + // integer field (count of disks formatted at parallely) + _("&Parallel Formatted Disks"), 1, par, par), + `Left(`CheckBox (`id (`write_label), + // check box + _("&Write the Volume Label"), true)), + `ButtonBox( + `PushButton(`id(`ok), Label::OKButton()), + `PushButton(`id(`cancel), Label::CancelButton()) + ) + )); + symbol ret = (symbol) UI::UserInput(); + par = (integer) UI::QueryWidget(`id(`par), `Value); + boolean write_vl = (boolean) UI::QueryWidget(`id(`write_label), `Value); + UI::CloseDialog(); + if (ret == `cancel) + { + return false; + } + + // final confirmation before formatting the discs + list<string> channels = maplist (integer id, selected, { + return DASDController::devices[id, "channel"]:""; + }); + string channels_str = mergestring (channels, ", "); + if (! Popup::AnyQuestionRichText ( + Popup::NoHeadline (), + // popup question + sformat (_("Formatting these disks destroys all data on them. +Really format the following disks? +%1"), + channels_str), + 60, + 20, + Label::YesButton (), + Label::NoButton (), + `focus_no + )) + { + return false; + } + + list<string> devices = maplist (integer id, selected, { + return DASDController::devices[id, "dev_name"]:""; + }); + DASDController::FormatDisks(devices, par, write_vl); + DASDController::ProbeDisks(); + + return true; + } + } + } + else + { + switch (action) + { + case `diag_on: + case `diag_off: + { + boolean value = action == `diag_on; + + foreach (integer id, selected, { + DASDController::devices[id, "diag"] = value; + }); + + return true; + } + + case `format_on: + case `format_off: + { + boolean value = action == `format_on; + + foreach (integer id, selected, { + DASDController::devices[id, "format"] = value; + }); + + return true; + } + } + } + + return false; + } + + /** * Draw the DASD dialog */ @@ -163,19 +366,6 @@ ); } - list actions = [ - // menu button id - `item(`id(`activate), _("&Activate")), - // menu button id - `item(`id(`deactivate), _("&Deactivate")), - // menu button id - `item(`id(`diag_on), _("Set DIAG O&n")), - // menu button id - `item(`id(`diag_off), _("Set DIAG O&ff")), - // menu button id - `item(`id(`format), _("&Format")) - ]; - /* Dialog content */ term content = `VBox( `HBox( @@ -189,17 +379,19 @@ `PushButton (`id (`filter), _("&Filter")) ) ), - `Table(`id(`table), `opt(`multiSelection), header, []), + `Table(`id(`table), `opt(`multiSelection, `notifyContextMenu), header, []), Mode::config () ? `HBox ( `PushButton(`id(`add), Label::AddButton()), `PushButton(`id(`delete), Label::DeleteButton()), - `HStretch () + `HStretch (), + // menu button + `MenuButton(`id(`operation), _("Perform &Action"), PossibleActions()) ) : `HBox ( `HStretch (), // menu button - `MenuButton (`id (`operation), _("Perform &Action"), actions) + `MenuButton(`id(`operation), _("Perform &Action"), PossibleActions()) ) ); @@ -239,7 +431,19 @@ symbol ret = nil; while (ret == nil) { - ret = (symbol) UI::UserInput(); + map event = UI::WaitForEvent(); + + if (Event::IsWidgetContextMenuActivated(event) == `table) + { + symbol action = ContextMenu::Simple(PossibleActions()); + if (PerformAction(action)) + ReloadDASDDialog (); + + ret = nil; + continue; + } + + ret = event["ID"]:(symbol) nil; if (ret == `filter) { @@ -266,196 +470,17 @@ ret = nil; continue; } - else if (ret == `activate) - { - list<integer> selected = ListSelectedDASD(); - if (isempty(selected)) - { - // error popup message - Popup::Message (_("No disk selected.")); - ret = nil; - continue; - } - - foreach (integer id, selected, { - string channel = DASDController::devices[id, "channel"]:""; - boolean diag = DASDController::diag[channel]:false; - DASDController::ActivateDisk(channel, diag); - }); - - DASDController::ProbeDisks(); - - ReloadDASDDialog (); - ret = nil; - } - else if (ret == `deactivate) - { - list<integer> selected = ListSelectedDASD(); - if (isempty(selected)) - { - // error popup message - Popup::Message (_("No disk selected.")); - ret = nil; - continue; - } - - foreach (integer id, selected, { - string channel = DASDController::devices[id, "channel"]:""; - boolean diag = DASDController::diag[channel]:false; - DASDController::DeactivateDisk(channel, diag); - }); - - DASDController::ProbeDisks(); - - ReloadDASDDialog (); - ret = nil; - } - else if (ret == `diag_on) - { - list<integer> selected = ListSelectedDASD(); - if (isempty(selected)) - { - // error popup message - Popup::Message (_("No disk selected.")); - ret = nil; - continue; - } - - foreach (integer id, selected, { - string channel = DASDController::devices[id, "channel"]:""; - boolean active = DASDController::devices[id, "resource", "io", 0, "active"]:false; - DASDController::diag[channel] = true; - if (active) - DASDController::ActivateDisk(channel, true); - }); - - DASDController::ProbeDisks(); - - ReloadDASDDialog (); - ret = nil; - } - else if (ret == `diag_off) - { - list<integer> selected = ListSelectedDASD(); - if (isempty(selected)) - { - // error popup message - Popup::Message (_("No disk selected.")); - ret = nil; - continue; - } - - foreach (integer id, selected, { - string channel = DASDController::devices[id, "channel"]:""; - boolean active = DASDController::devices[id, "resource", "io", 0, "active"]:false; - DASDController::diag[channel] = false; - if (active) - DASDController::ActivateDisk(channel, false); - }); - - DASDController::ProbeDisks(); - - ReloadDASDDialog (); - ret = nil; - } - else if (ret == `format) + else if (contains([ `activate, `deactivate, `diag_on, `diag_off, + `format, `format_on, `format_off ], ret)) { - list<integer> selected = ListSelectedDASD(); - if (isempty(selected)) - { - // error popup message - Popup::Message (_("No disk selected.")); - ret = nil; - continue; - } - - // check if disks are R/W and active - string problem = ""; - foreach (integer id, selected, { - boolean active = DASDController::devices[id, "resource", "io", 0, "active"]:false; - string access = DASDController::devices[id, "resource", "io", 0, "mode"]:"ro"; - if (!active) - { - // error report, %1 is device identification - problem = sformat (_("Disk %1 is not active."), - DASDController::devices[id, "channel"]:""); - } - else if (access != "rw") - { - problem = sformat ( - // error report, %1 is device identification - _("Disk %1 is not accessible for writing."), - DASDController::devices[id, "channel"]:""); - } - }); - if (problem != "") - { - Popup::Message (problem); - ret = nil; - continue; - } - integer par = 8; - if (par > size (selected)) - par = size (selected); - boolean cancel = false; - UI::OpenDialog (`VBox ( - `IntField (`id (`par), - // integer field (count of disks formatted at parallely) - _("&Parallel Formatted Disks"), 1, par, par), - `Left (`CheckBox (`id (`write_label), - // check box - _("&Write the Volume Label"), true)), - `ButtonBox ( - `PushButton (`id (`ok), Label::OKButton ()), - `PushButton (`id (`cancel), Label::CancelButton ()) - ) - )); - ret = (symbol) UI::UserInput(); - par = (integer) UI::QueryWidget(`id(`par), `Value); - boolean write_vl = (boolean) UI::QueryWidget(`id(`write_label), `Value); - UI::CloseDialog (); - if (ret == `cancel) - { - UI::SetFocus (`table); - ret = nil; - continue; - } - - // final confirmation before formatting the discs - list<string> channels = maplist (integer id, selected, { - return DASDController::devices[id, "channel"]:""; - }); - string channels_str = mergestring (channels, ", "); - if (! Popup::AnyQuestionRichText ( - Popup::NoHeadline (), - // popup question - sformat (_("Formatting these disks destroys all data on them. -Really format the following disks? -%1"), - channels_str), - 60, - 20, - Label::YesButton (), - Label::NoButton (), - `focus_no - )) - { - UI::SetFocus (`table); - ret = nil; - continue; - } - // final confirmation -- end + if (PerformAction(ret)) + ReloadDASDDialog (); - list<string> devices = maplist (integer id, selected, { - return DASDController::devices[id, "dev_name"]:""; - }); - DASDController::FormatDisks(devices, par, write_vl); - DASDController::ProbeDisks(); - ReloadDASDDialog (); - UI::SetFocus (`table); ret = nil; + continue; } } + 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] r67865 - /branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/DmCo.cc
by fehr＠svn2.opensuse.org 05 Apr '12

05 Apr '12

Author: fehr Date: Thu Apr 5 14:57:15 2012 New Revision: 67865 URL: http://svn.opensuse.org/viewcvs/yast?rev=67865&view=rev Log: cope with vg and lv names containg '-' Modified: branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/DmCo.cc Modified: branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/DmCo.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP3-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/DmCo.cc (original) +++ branches/SuSE-Code-11-SP3-Branch/storage/libstorage/src/DmCo.cc Thu Apr 5 14:57:15 2012 @@ -295,10 +295,11 @@ on.erase( on.size()-4 ); if( delim.match( on ) ) { - string devname = "/dev/" + on.substr( 0, delim.so(0)+1 ) + - "/" + on.substr( delim.eo(0)-1 ); - skip = getStorage()->knownDevice( devname ); - y2mil( "devname:" << devname << " skip:" << skip ); + on[delim.so(0)+1] = '/'; + boost::replace_all(on,"--","-"); + on = "/dev/" + on; + skip = getStorage()->knownDevice( on ); + y2mil( "devname:" << on << " skip:" << skip ); } } if (!skip && m->sizeK()>0 && !only_crypt ) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0