Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at 2011-11-05 11:33:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2 (Old) and /work/SRC/openSUSE:Factory/.yast2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2/yast2.changes 2011-10-05 17:48:33.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2.new/yast2.changes 2011-11-05 12:14:36.000000000 +0100 @@ -2 +2,22 @@ -Wed Oct 5 10:21:02 UTC 2011 - jsrain@site +Wed Nov 2 14:49:31 CET 2011 - [email protected] + +- Unified starting, stopping and checking for firewall status + (bnc#727445) +- 2.21.25 + +------------------------------------------------------------------- +Tue Oct 25 15:45:33 CEST 2011 - [email protected] + +- Added new function String::ReplaceWith that is a replacement for + often used mergestring(splitstring(...)) + +------------------------------------------------------------------- +Thu Oct 20 11:54:34 CEST 2011 - [email protected] + +- Fixed script for generating translations for firewall services + defined by other packages +- Regenerated translations for firewall services defined by other + packages (bnc#722877) + +------------------------------------------------------------------- +Wed Oct 5 10:21:02 UTC 2011 - [email protected] @@ -92 +113 @@ -Thu Sep 1 06:40:43 UTC 2011 - jsrain@site +Thu Sep 1 06:40:43 UTC 2011 - [email protected] Old: ---- yast2-2.21.24.tar.bz2 New: ---- yast2-2.21.25.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.aSeZfS/_old 2011-11-05 12:15:00.000000000 +0100 +++ /var/tmp/diff_new_pack.aSeZfS/_new 2011-11-05 12:15:00.000000000 +0100 @@ -19,13 +19,11 @@ Name: yast2 -Version: 2.21.24 +Version: 2.21.25 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-2.21.24.tar.bz2 - -Prefix: /usr +Source0: yast2-%{version}.tar.bz2 Group: System/YaST License: GPL-2.0+ @@ -129,18 +127,18 @@ installation with YaST2. %prep -%setup -n yast2-2.21.24 +%setup -n yast2-%{version} %build -%{prefix}/bin/y2tool y2autoconf -%{prefix}/bin/y2tool y2automake +%{_prefix}/bin/y2tool y2autoconf +%{_prefix}/bin/y2tool y2automake autoreconf --force --install export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" %{?suse_update_config:%{suse_update_config -f}} -./configure --libdir=%{_libdir} --prefix=%{prefix} --mandir=%{_mandir} +./configure --libdir=%{_libdir} --prefix=%{_prefix} --mandir=%{_mandir} # V=1: verbose build in case we used AM_SILENT_RULES(yes) # so that RPM_OPT_FLAGS check works make %{?jobs:-j%jobs} V=1 @@ -149,19 +147,19 @@ %install make install DESTDIR="$RPM_BUILD_ROOT" -[ -e "%{prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] || Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT" -for f in `find $RPM_BUILD_ROOT/%{prefix}/share/applications/YaST2/ -name "*.desktop"` ; do +[ -e "%{_prefix}/share/YaST2/data/devtools/NO_MAKE_CHECK" ] || Y2DIR="$RPM_BUILD_ROOT/usr/share/YaST2" make check DESTDIR="$RPM_BUILD_ROOT" +for f in `find $RPM_BUILD_ROOT/%{_prefix}/share/applications/YaST2/ -name "*.desktop"` ; do d=${f##*/} %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop} done mkdir -p "$RPM_BUILD_ROOT"/usr/share/YaST2/clients -mkdir -p "$RPM_BUILD_ROOT"%{prefix}/share/applications/YaST2 +mkdir -p "$RPM_BUILD_ROOT"%{_prefix}/share/applications/YaST2 mkdir -p "$RPM_BUILD_ROOT"/usr/share/YaST2/images mkdir -p "$RPM_BUILD_ROOT"/usr/share/YaST2/locale mkdir -p "$RPM_BUILD_ROOT"/usr/share/YaST2/modules mkdir -p "$RPM_BUILD_ROOT"/usr/share/YaST2/scrconf -mkdir -p "$RPM_BUILD_ROOT"%{prefix}/lib/YaST2/bin +mkdir -p "$RPM_BUILD_ROOT"%{_prefix}/lib/YaST2/bin mkdir -p "$RPM_BUILD_ROOT"/usr/share/YaST2/data mkdir -p "$RPM_BUILD_ROOT"/usr/share/YaST2/include mkdir -p "$RPM_BUILD_ROOT"/var/lib/YaST2 @@ -181,13 +179,13 @@ # basic directory structure %dir /usr/share/YaST2/clients -%dir %{prefix}/share/applications/YaST2 -%{prefix}/share/applications/YaST2/groups +%dir %{_prefix}/share/applications/YaST2 +%{_prefix}/share/applications/YaST2/groups %dir /usr/share/YaST2/images %dir /usr/share/YaST2/locale %dir /usr/share/YaST2/modules %dir /usr/share/YaST2/scrconf -%dir %{prefix}/lib/YaST2/bin +%dir %{_prefix}/lib/YaST2/bin %dir /usr/share/YaST2/data %dir /usr/share/YaST2/include %dir /var/lib/YaST2 @@ -204,16 +202,16 @@ /usr/share/YaST2/clients/* /usr/share/YaST2/modules/* /usr/share/YaST2/scrconf/* -%{prefix}/lib/YaST2/bin/* +%{_prefix}/lib/YaST2/bin/* /usr/lib/YaST2/servers_non_y2/ag_* /etc/bash_completion.d/yast2*.sh /etc/YaST2/XVersion /var/adm/fillup-templates/sysconfig.yast2 # documentation (not included in devel subpackage) -%doc %dir %{prefix}/share/doc/packages/yast2 -%doc %{prefix}/share/doc/packages/yast2/COPYING -%doc %{prefix}/share/doc/packages/yast2/README +%doc %dir %{_prefix}/share/doc/packages/yast2 +%doc %{_prefix}/share/doc/packages/yast2/COPYING +%doc %{_prefix}/share/doc/packages/yast2/README %doc %{_mandir}/*/* /sbin/* @@ -235,21 +233,21 @@ %files devel-doc %defattr(-,root,root) -%doc %{prefix}/share/doc/packages/yast2/autodocs -%doc %{prefix}/share/doc/packages/yast2/commandline -%doc %{prefix}/share/doc/packages/yast2/control -%doc %{prefix}/share/doc/packages/yast2/cron -%doc %{prefix}/share/doc/packages/yast2/cwm -%doc %{prefix}/share/doc/packages/yast2/desktop -%doc %{prefix}/share/doc/packages/yast2/gpg -%doc %{prefix}/share/doc/packages/yast2/log -%doc %{prefix}/share/doc/packages/yast2/network -%doc %{prefix}/share/doc/packages/yast2/packages -%doc %{prefix}/share/doc/packages/yast2/runlevel -%doc %{prefix}/share/doc/packages/yast2/sequencer -%doc %{prefix}/share/doc/packages/yast2/system -%doc %{prefix}/share/doc/packages/yast2/types -%doc %{prefix}/share/doc/packages/yast2/wizard -%doc %{prefix}/share/doc/packages/yast2/xml +%doc %{_prefix}/share/doc/packages/yast2/autodocs +%doc %{_prefix}/share/doc/packages/yast2/commandline +%doc %{_prefix}/share/doc/packages/yast2/control +%doc %{_prefix}/share/doc/packages/yast2/cron +%doc %{_prefix}/share/doc/packages/yast2/cwm +%doc %{_prefix}/share/doc/packages/yast2/desktop +%doc %{_prefix}/share/doc/packages/yast2/gpg +%doc %{_prefix}/share/doc/packages/yast2/log +%doc %{_prefix}/share/doc/packages/yast2/network +%doc %{_prefix}/share/doc/packages/yast2/packages +%doc %{_prefix}/share/doc/packages/yast2/runlevel +%doc %{_prefix}/share/doc/packages/yast2/sequencer +%doc %{_prefix}/share/doc/packages/yast2/system +%doc %{_prefix}/share/doc/packages/yast2/types +%doc %{_prefix}/share/doc/packages/yast2/wizard +%doc %{_prefix}/share/doc/packages/yast2/xml %changelog ++++++ yast2-2.21.24.tar.bz2 -> yast2-2.21.25.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.21.24/Makefile.am new/yast2-2.21.25/Makefile.am --- old/yast2-2.21.24/Makefile.am 2011-10-05 12:24:00.000000000 +0200 +++ new/yast2-2.21.25/Makefile.am 2011-11-02 14:52:21.000000000 +0100 @@ -20,7 +20,6 @@ IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) COPYRIGHT_files_gpl = README COPYING @@ -155,7 +154,7 @@ $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ done -package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local +package: check-up-to-date check-tagversion check-textdomain package-local TAGVERSION = $(Y2TOOL) tagversion @@ -185,21 +184,6 @@ check-parse: @echo "Not running parseycp." -check-all-packages: - @if [ ! -e "$(ALL_PACKAGES)" ]; then \ - echo ERROR: "Can't find $(ALL_PACKAGES)"; false; \ - fi - @if ! grep -q "^$(RPMNAME)[[:space:]]" $(ALL_PACKAGES); then \ - echo ERROR: "$(RPMNAME) not in $(ALL_PACKAGES)"; false; \ - fi - @if grep -q "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); then \ - echo ERROR: "$(RPMNAME) info in $(ALL_PACKAGES) contains some unknown (?) fields:"; \ - echo; \ - grep "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); \ - echo; \ - false; \ - fi - check-textdomain: $(Y2TOOL) check-textdomain $(srcdir) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.21.24/Makefile.in new/yast2-2.21.25/Makefile.in --- old/yast2-2.21.24/Makefile.in 2011-10-05 12:24:07.000000000 +0200 +++ new/yast2-2.21.25/Makefile.in 2011-11-02 14:52:29.000000000 +0100 @@ -264,7 +264,6 @@ # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools) -ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl) COPYRIGHT_files_gpl = README COPYING COPYRIGHT_files_yast = YAST_LICENSE README COPYING COPYRIGHT.english \ @@ -905,7 +904,7 @@ $(Y2TOOL) create-spec < $$i > $$here/package/$${newname} ; \ done -package: check-up-to-date check-tagversion check-all-packages check-textdomain package-local +package: check-up-to-date check-tagversion check-textdomain package-local check-up-to-date check-cvs-up-to-date check-svn-up-to-date: if [ -d $(srcdir)/CVS ]; then \ @@ -933,21 +932,6 @@ check-parse: @echo "Not running parseycp." -check-all-packages: - @if [ ! -e "$(ALL_PACKAGES)" ]; then \ - echo ERROR: "Can't find $(ALL_PACKAGES)"; false; \ - fi - @if ! grep -q "^$(RPMNAME)[[:space:]]" $(ALL_PACKAGES); then \ - echo ERROR: "$(RPMNAME) not in $(ALL_PACKAGES)"; false; \ - fi - @if grep -q "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); then \ - echo ERROR: "$(RPMNAME) info in $(ALL_PACKAGES) contains some unknown (?) fields:"; \ - echo; \ - grep "^$(RPMNAME)[[:space:]]\+.*?" $(ALL_PACKAGES); \ - echo; \ - false; \ - fi - check-textdomain: $(Y2TOOL) check-textdomain $(srcdir) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.21.24/VERSION new/yast2-2.21.25/VERSION --- old/yast2-2.21.24/VERSION 2011-10-05 12:22:17.000000000 +0200 +++ new/yast2-2.21.25/VERSION 2011-11-02 14:51:09.000000000 +0100 @@ -1 +1 @@ -2.21.24 +2.21.25 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.21.24/configure new/yast2-2.21.25/configure --- old/yast2-2.21.24/configure 2011-10-05 12:24:03.000000000 +0200 +++ new/yast2-2.21.25/configure 2011-11-02 14:52:25.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for yast2 2.21.24. +# Generated by GNU Autoconf 2.68 for yast2 2.21.25. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -559,8 +559,8 @@ # Identity of this package. PACKAGE_NAME='yast2' PACKAGE_TARNAME='yast2' -PACKAGE_VERSION='2.21.24' -PACKAGE_STRING='yast2 2.21.24' +PACKAGE_VERSION='2.21.25' +PACKAGE_STRING='yast2 2.21.25' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1232,7 +1232,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2 2.21.24 to adapt to many kinds of systems. +\`configure' configures yast2 2.21.25 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1303,7 +1303,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2 2.21.24:";; + short | recursive ) echo "Configuration of yast2 2.21.25:";; esac cat <<\_ACEOF @@ -1383,7 +1383,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2 configure 2.21.24 +yast2 configure 2.21.25 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1400,7 +1400,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2 $as_me 2.21.24, which was +It was created by yast2 $as_me 2.21.25, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2330,7 +2330,7 @@ # Define the identity of the package. PACKAGE='yast2' - VERSION='2.21.24' + VERSION='2.21.25' cat >>confdefs.h <<_ACEOF @@ -2452,7 +2452,7 @@ -VERSION="2.21.24" +VERSION="2.21.25" RPMNAME="yast2" MAINTAINER="Jiri Srain <[email protected]>" @@ -3498,7 +3498,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2 $as_me 2.21.24, which was +This file was extended by yast2 $as_me 2.21.25, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3551,7 +3551,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -yast2 config.status 2.21.24 +yast2 config.status 2.21.25 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.21.24/configure.in new/yast2-2.21.25/configure.in --- old/yast2-2.21.24/configure.in 2011-10-05 12:24:00.000000000 +0200 +++ new/yast2-2.21.25/configure.in 2011-11-02 14:52:21.000000000 +0100 @@ -1,9 +1,9 @@ dnl configure.in for yast2 dnl -dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.21.2 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2, 2.21.24, http://bugs.opensuse.org/, yast2) +AC_INIT(yast2, 2.21.25, http://bugs.opensuse.org/, yast2) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.21.24" +VERSION="2.21.25" RPMNAME="yast2" MAINTAINER="Jiri Srain <[email protected]>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.21.24/library/modules/Version.ycp new/yast2-2.21.25/library/modules/Version.ycp --- old/yast2-2.21.24/library/modules/Version.ycp 2011-10-05 12:24:09.000000000 +0200 +++ new/yast2-2.21.25/library/modules/Version.ycp 2011-11-02 14:52:31.000000000 +0100 @@ -20,7 +20,7 @@ /** * Version of the yast2 package */ -global string yast2 = "2.21.24"; +global string yast2 = "2.21.25"; /* EOF */ } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.21.24/library/network/src/SuSEFirewall.ycp new/yast2-2.21.25/library/network/src/SuSEFirewall.ycp --- old/yast2-2.21.24/library/network/src/SuSEFirewall.ycp 2011-09-01 09:18:05.000000000 +0200 +++ new/yast2-2.21.25/library/network/src/SuSEFirewall.ycp 2011-11-02 14:52:06.000000000 +0100 @@ -6,7 +6,7 @@ * Summary: Interface manipulation of /etc/sysconfig/SuSEFirewall * Authors: Lukas Ocilka <[email protected]> * - * $Id: SuSEFirewall.ycp 65400 2011-08-26 11:31:11Z locilka $ + * $Id: SuSEFirewall.ycp 66662 2011-11-02 13:51:17Z locilka $ * * Module for handling SuSEfirewall2. */ @@ -115,6 +115,9 @@ list <string> firewall_services = [ "SuSEfirewall2_init", "SuSEfirewall2_setup" ]; list <string> firewall_services_reverse = [ "SuSEfirewall2_setup", "SuSEfirewall2_init" ]; + /* script for starting and checking firewall status */ + string firewall_script = "/sbin/SuSEfirewall2"; + list <string> SuSEFirewall_variables = [ // zones and interfaces "FW_DEV_INT", "FW_DEV_DMZ", "FW_DEV_EXT", @@ -1234,8 +1237,8 @@ tmpdir_file = tmpdir_file + "/SuSEfirewall2_YaST_output"; string command = sformat( - "/sbin/SuSEfirewall2 start 2>'%1'; cat '%1'; rm -rf '%1'", - tmpdir_file + "%1 start 2>'%2'; cat '%2'; rm -rf '%2'", + firewall_script, tmpdir_file ); y2milestone ("Starting firewall..."); map cmd = (map) SCR::Execute (.target.bash_output, command); @@ -1268,8 +1271,8 @@ tmpdir_file = tmpdir_file + "/SuSEfirewall2_YaST_output"; string command = sformat( - "/sbin/SuSEfirewall2 stop 2>'%1'; cat '%1'; rm -rf '%1'", - tmpdir_file + "%1 stop 2>'%2'; cat '%2'; rm -rf '%2'", + firewall_script, tmpdir_file ); y2milestone ("Stopping firewall..."); map cmd = (map) SCR::Execute (.target.bash_output, command); @@ -1371,19 +1374,16 @@ if (! SuSEFirewallIsInstalled()) return false; - //if (Mode::normal() || Mode::commandline()) { - foreach (string service, firewall_services, { - if (Service::Status(service) == 0) { - started = true; - break; - } - }); - //} + if (Mode::testsuite()) return true; - if (started == true) { - y2milestone("Firewall services are started"); + y2milestone ("Checking firewall status..."); + string cmd = sformat ("%1 status 1>/dev/null", firewall_script); + integer cmd_ret = (integer) SCR::Execute (.target.bash, cmd); + if (cmd_ret == 0) { + y2milestone ("Firewall services are started"); + started = true; } else { - y2milestone("Firewall services are stopped"); + y2milestone ("Firewall services are stopped"); } return started; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.21.24/library/types/src/String.ycp new/yast2-2.21.25/library/types/src/String.ycp --- old/yast2-2.21.24/library/types/src/String.ycp 2011-09-01 09:18:05.000000000 +0200 +++ new/yast2-2.21.25/library/types/src/String.ycp 2011-11-01 13:17:24.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: String manipulation routines * Authors: Michal Svec <[email protected]> * - * $Id: String.ycp 65459 2011-08-31 07:51:51Z lslezak $ + * $Id: String.ycp 66575 2011-10-25 13:49:47Z locilka $ */ { @@ -1354,5 +1354,21 @@ return dir; } +/** + * Replaces all characters in a given string with some other string or character + * + * @param (string) input string + * @param (string) all characters to replace + * @param (string) replace with + * @param (string) string with replaced characters + * + * @example + * // Replace whitespace characters with dashes + * ReplaceWith ("a\nb\tc d", "\n\t ", "-") -> "a-b-c-d" + */ +global string ReplaceWith (string str, string chars, string glue) { + return mergestring (splitstring (str, chars), glue); +} + /* EOF */ } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.21.24/library/types/testsuite/tests/String.out new/yast2-2.21.25/library/types/testsuite/tests/String.out --- old/yast2-2.21.24/library/types/testsuite/tests/String.out 2011-08-23 10:09:34.000000000 +0200 +++ new/yast2-2.21.25/library/types/testsuite/tests/String.out 2011-11-01 13:17:24.000000000 +0100 @@ -134,3 +134,6 @@ Return &&&&Hello Return &&&&Hello Return &&Hello +Dump String::ReplaceWith +Return a-b-c-d +Return this is an input text containing some special characters to remove diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-2.21.24/library/types/testsuite/tests/String.ycp new/yast2-2.21.25/library/types/testsuite/tests/String.ycp --- old/yast2-2.21.24/library/types/testsuite/tests/String.ycp 2011-08-23 10:09:34.000000000 +0200 +++ new/yast2-2.21.25/library/types/testsuite/tests/String.ycp 2011-11-01 13:17:24.000000000 +0100 @@ -174,4 +174,8 @@ TEST(``(String::RemoveShortcut("&&&&Hello")), [], nil); TEST(``(String::RemoveShortcut("&&&&&Hello")), [], nil); TEST(``(String::RemoveShortcut("&&He&llo")), [], nil); + +DUMP("String::ReplaceWith"); +TEST(``(String::ReplaceWith ("a\nb\tc d", "\n\t ", "-")), [], nil); +TEST(``(String::ReplaceWith ("this$# is an in&put text co@ntain$ing some special## ch@a$racters to remove", "&$#@", "")), [], nil); } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
