Hello community,
here is the log from the commit of package yast2-core for openSUSE:Factory
checked in at Mon May 30 09:36:29 CEST 2011.
--------
--- yast2-core/yast2-core.changes 2011-04-04 09:17:19.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-core/yast2-core.changes 2011-05-27
17:23:23.000000000 +0200
@@ -1,0 +2,14 @@
+Fri May 27 17:17:14 CEST 2011 - mvid...@suse.cz
+
+- Fixed a garbled unbreakable space used as a thousand separator (bnc#683881).
+- 2.21.2
+
+-------------------------------------------------------------------
+Fri May 27 11:32:55 CEST 2011 - mvid...@suse.cz
+
+- Don't crash when adding to a nil list (bnc#694520).
+- A nil (type cast failure) in a list literal will not make the whole
+ list nil (bnc#694520).
+- 2.21.1
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-core-2.21.0.tar.bz2
New:
----
yast2-core-2.21.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-core.spec ++++++
--- /var/tmp/diff_new_pack.BtJfT3/_old 2011-05-30 09:32:49.000000000 +0200
+++ /var/tmp/diff_new_pack.BtJfT3/_new 2011-05-30 09:32:49.000000000 +0200
@@ -19,16 +19,16 @@
Name: yast2-core
-Version: 2.21.0
+Version: 2.21.2
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-core-2.21.0.tar.bz2
+Source0: yast2-core-2.21.2.tar.bz2
Prefix: /usr
Group: System/YaST
-License: GPLv2+
+License: GPL v2 or later
# obviously
BuildRequires: boost-devel gcc-c++
# we have a parser
@@ -59,7 +59,7 @@
library for the YCP scripting language used in YaST2.
%package devel
-License: GPLv2+
+
Requires: yast2-core = %version
Group: Development/Libraries
Summary: YaST2 - Core Libraries
@@ -77,7 +77,7 @@
applications using the YaST2 YCP interpreter.
%prep
-%setup -n yast2-core-2.21.0
+%setup -n yast2-core-2.21.2
%build
++++++ yast2-core-2.21.0.tar.bz2 -> yast2-core-2.21.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-core-2.21.0/VERSION
new/yast2-core-2.21.2/VERSION
--- old/yast2-core-2.21.0/VERSION 2011-04-01 08:10:18.000000000 +0200
+++ new/yast2-core-2.21.2/VERSION 2011-05-27 17:16:02.000000000 +0200
@@ -1 +1 @@
-2.21.0
+2.21.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-core-2.21.0/aclocal.m4
new/yast2-core-2.21.2/aclocal.m4
--- old/yast2-core-2.21.0/aclocal.m4 2011-04-04 09:14:55.000000000 +0200
+++ new/yast2-core-2.21.2/aclocal.m4 2011-05-26 17:13:50.000000000 +0200
@@ -19,6 +19,164 @@
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically
`autoreconf'.])])
+# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
+# serial 1 (pkg-config-0.24)
+#
+# Copyright © 2004 Scott James Remnant <sc...@netsplit.com>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
+# ----------------------------------
+AC_DEFUN([PKG_PROG_PKG_CONFIG],
+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search
path])
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+fi
+if test -n "$PKG_CONFIG"; then
+ _pkg_min_version=m4_default([$1], [0.9.0])
+ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ PKG_CONFIG=""
+ fi
+fi[]dnl
+])# PKG_PROG_PKG_CONFIG
+
+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+#
+# Check to see whether a particular set of modules exists. Similar
+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
+#
+# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+# only at the first occurence in configure.ac, so if the first place
+# it's called might be skipped (such as if it is within an "if", you
+# have to call PKG_CHECK_EXISTS manually
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_EXISTS],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+if test -n "$PKG_CONFIG" && \
+ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+ m4_default([$2], [:])
+m4_ifvaln([$3], [else
+ $3])dnl
+fi])
+
+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+# ---------------------------------------------
+m4_define([_PKG_CONFIG],
+[if test -n "$$1"; then
+ pkg_cv_[]$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
+ PKG_CHECK_EXISTS([$3],
+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+ [pkg_failed=yes])
+ else
+ pkg_failed=untried
+fi[]dnl
+])# _PKG_CONFIG
+
+# _PKG_SHORT_ERRORS_SUPPORTED
+# -----------------------------
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi[]dnl
+])# _PKG_SHORT_ERRORS_SUPPORTED
+
+
+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+# [ACTION-IF-NOT-FOUND])
+#
+#
+# Note that if there is a possibility the first call to
+# PKG_CHECK_MODULES might not happen, you should be sure to include an
+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+#
+#
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_MODULES],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
+
+pkg_failed=no
+AC_MSG_CHECKING([for $1])
+
+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables
$1[]_CFLAGS
+and $1[]_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.])
+
+if test $pkg_failed = yes; then
+ AC_MSG_RESULT([no])
+ _PKG_SHORT_ERRORS_SUPPORTED
+ if test $_pkg_short_errors_supported = yes; then
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2"
2>&1`
+ else
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+
+ m4_default([$4], [AC_MSG_ERROR(
+[Package requirements ($2) were not met:
+
+$$1_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+_PKG_TEXT])[]dnl
+ ])
+elif test $pkg_failed = untried; then
+ AC_MSG_RESULT([no])
+ m4_default([$4], [AC_MSG_FAILURE(
+[The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+_PKG_TEXT
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
+ ])
+else
+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+ AC_MSG_RESULT([yes])
+ $3
+fi[]dnl
+])# PKG_CHECK_MODULES
+
# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation,
Inc.
#
# This file is free software; the Free Software Foundation
@@ -1014,164 +1172,11 @@
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
-# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
-# serial 1 (pkg-config-0.24)
-#
-# Copyright © 2004 Scott James Remnant <sc...@netsplit.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-# ----------------------------------
-AC_DEFUN([PKG_PROG_PKG_CONFIG],
-[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
-AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
-AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search
path])
-
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
- AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
-fi
-if test -n "$PKG_CONFIG"; then
- _pkg_min_version=m4_default([$1], [0.9.0])
- AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
- if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
- AC_MSG_RESULT([yes])
- else
- AC_MSG_RESULT([no])
- PKG_CONFIG=""
- fi
-fi[]dnl
-])# PKG_PROG_PKG_CONFIG
-
-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-#
-# Check to see whether a particular set of modules exists. Similar
-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
-#
-# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-# only at the first occurence in configure.ac, so if the first place
-# it's called might be skipped (such as if it is within an "if", you
-# have to call PKG_CHECK_EXISTS manually
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_EXISTS],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-if test -n "$PKG_CONFIG" && \
- AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
- m4_default([$2], [:])
-m4_ifvaln([$3], [else
- $3])dnl
-fi])
-
-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-# ---------------------------------------------
-m4_define([_PKG_CONFIG],
-[if test -n "$$1"; then
- pkg_cv_[]$1="$$1"
- elif test -n "$PKG_CONFIG"; then
- PKG_CHECK_EXISTS([$3],
- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
- [pkg_failed=yes])
- else
- pkg_failed=untried
-fi[]dnl
-])# _PKG_CONFIG
-
-# _PKG_SHORT_ERRORS_SUPPORTED
-# -----------------------------
-AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _pkg_short_errors_supported=no
-fi[]dnl
-])# _PKG_SHORT_ERRORS_SUPPORTED
-
-
-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-# [ACTION-IF-NOT-FOUND])
-#
-#
-# Note that if there is a possibility the first call to
-# PKG_CHECK_MODULES might not happen, you should be sure to include an
-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-#
-#
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_MODULES],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
-AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
-
-pkg_failed=no
-AC_MSG_CHECKING([for $1])
-
-_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
-_PKG_CONFIG([$1][_LIBS], [libs], [$2])
-
-m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables
$1[]_CFLAGS
-and $1[]_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.])
-
-if test $pkg_failed = yes; then
- AC_MSG_RESULT([no])
- _PKG_SHORT_ERRORS_SUPPORTED
- if test $_pkg_short_errors_supported = yes; then
- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2"
2>&1`
- else
- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-
- m4_default([$4], [AC_MSG_ERROR(
-[Package requirements ($2) were not met:
-
-$$1_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-_PKG_TEXT])[]dnl
- ])
-elif test $pkg_failed = untried; then
- AC_MSG_RESULT([no])
- m4_default([$4], [AC_MSG_FAILURE(
-[The pkg-config script could not be found or is too old. Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-_PKG_TEXT
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
- ])
-else
- $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
- $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
- AC_MSG_RESULT([yes])
- $3
-fi[]dnl
-])# PKG_CHECK_MODULES
-
+m4_include([libtool.m4])
+m4_include([ltoptions.m4])
+m4_include([ltsugar.m4])
+m4_include([ltversion.m4])
+m4_include([lt~obsolete.m4])
dnl check for docbook -*- autoconf -*-
@@ -1229,8 +1234,3 @@
])
-m4_include([libtool.m4])
-m4_include([ltoptions.m4])
-m4_include([ltsugar.m4])
-m4_include([ltversion.m4])
-m4_include([lt~obsolete.m4])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-core-2.21.0/agents-perl/doc/ycp-pm-pod.html
new/yast2-core-2.21.2/agents-perl/doc/ycp-pm-pod.html
--- old/yast2-core-2.21.0/agents-perl/doc/ycp-pm-pod.html 2011-04-04
09:16:20.000000000 +0200
+++ new/yast2-core-2.21.2/agents-perl/doc/ycp-pm-pod.html 2011-05-26
17:18:28.000000000 +0200
@@ -4,7 +4,7 @@
<head>
<title>ycp - a Perl module for parsing and writing the YaST2 Communication
Protocol</title>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<link rev="made" href="mailto:feedb...@suse.de"; />
+<link rev="made" href="mailto:none"; />
</head>
<body style="background-color: white">
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-core-2.21.0/libycp/src/Type.cc
new/yast2-core-2.21.2/libycp/src/Type.cc
--- old/yast2-core-2.21.0/libycp/src/Type.cc 2009-12-18 14:51:23.000000000
+0100
+++ new/yast2-core-2.21.2/libycp/src/Type.cc 2011-05-26 18:18:06.000000000
+0200
@@ -155,7 +155,7 @@
std::ostream &
-Type::toXml( std::ostream & str, int indent ) const
+Type::toXml( std::ostream & str, int /*indent*/ ) const
{
str << " type=\"" << toXmlString() << "\"";
if (m_const) str << " const=\"1\"";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-core-2.21.0/libycp/src/YCPBoolean.cc
new/yast2-core-2.21.2/libycp/src/YCPBoolean.cc
--- old/yast2-core-2.21.0/libycp/src/YCPBoolean.cc 2009-12-18
14:51:23.000000000 +0100
+++ new/yast2-core-2.21.2/libycp/src/YCPBoolean.cc 2011-05-26
18:18:11.000000000 +0200
@@ -60,7 +60,7 @@
std::ostream &
-YCPBooleanRep::toXml (std::ostream & str, int indent ) const
+YCPBooleanRep::toXml (std::ostream & str, int /*indent*/ ) const
{
return str << "<const type=\"bool\" value=\"" << ( v ? "true" : "false" )
<< "\"/>";
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-core-2.21.0/libycp/src/YCPBuiltinFloat.cc
new/yast2-core-2.21.2/libycp/src/YCPBuiltinFloat.cc
--- old/yast2-core-2.21.0/libycp/src/YCPBuiltinFloat.cc 2009-12-18
14:51:23.000000000 +0100
+++ new/yast2-core-2.21.2/libycp/src/YCPBuiltinFloat.cc 2011-05-27
17:06:54.000000000 +0200
@@ -31,6 +31,7 @@
#include "ycp/StaticDeclaration.h"
#include "y2log.h"
+#include "y2string.h"
extern StaticDeclaration static_declarations;
@@ -285,13 +286,14 @@
if (f.isNull () || precision.isNull ())
return YCPNull ();
- std::ostringstream ss;
+ std::wostringstream ss; // bnc#683881#c12: need wide chars
ss.imbue (std::locale (""));
ss.precision (precision->value ());
ss << fixed<< f->value ();
- YCPString ret (ss.str ());
- return ret;
+ string in_utf8;
+ wchar2utf8 (ss.str (), &in_utf8);
+ return YCPString (in_utf8);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-core-2.21.0/libycp/src/YCPBuiltinList.cc
new/yast2-core-2.21.2/libycp/src/YCPBuiltinList.cc
--- old/yast2-core-2.21.0/libycp/src/YCPBuiltinList.cc 2009-12-18
14:51:23.000000000 +0100
+++ new/yast2-core-2.21.2/libycp/src/YCPBuiltinList.cc 2011-05-26
18:52:10.000000000 +0200
@@ -826,7 +826,7 @@
static YCPValue
-l_add (const YCPList &list, const YCPValue &value)
+l_add (const YCPValue &list, const YCPValue &value)
{
/**
* @builtin add
@@ -842,12 +842,13 @@
* @usage add ([1, 4], 8) -> [1, 4, 8]
*/
- if (list.isNull ())
+ if (list.isNull () || !list->isList())
{
+ ycp2error ("Adding to a nil list");
return YCPNull ();
}
- return list->functionalAdd (value);
+ return list->asList()->functionalAdd (value);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-core-2.21.0/libycp/src/YCPByteblock.cc
new/yast2-core-2.21.2/libycp/src/YCPByteblock.cc
--- old/yast2-core-2.21.0/libycp/src/YCPByteblock.cc 2009-12-18
14:51:23.000000000 +0100
+++ new/yast2-core-2.21.2/libycp/src/YCPByteblock.cc 2011-05-26
18:18:10.000000000 +0200
@@ -138,7 +138,7 @@
}
std::ostream &
-YCPByteblockRep::toXml (std::ostream & str, int indent ) const
+YCPByteblockRep::toXml (std::ostream & str, int /*indent*/ ) const
{
return Xmlcode::writeBytep (str, bytes, len);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-core-2.21.0/libycp/src/YCPCode.cc
new/yast2-core-2.21.2/libycp/src/YCPCode.cc
--- old/yast2-core-2.21.0/libycp/src/YCPCode.cc 2009-12-18 14:51:23.000000000
+0100
+++ new/yast2-core-2.21.2/libycp/src/YCPCode.cc 2011-05-26 18:18:05.000000000
+0200
@@ -163,7 +163,7 @@
}
std::ostream &
-YCPEntryRep::toXml( std::ostream & str, int indent ) const
+YCPEntryRep::toXml( std::ostream & str, int /*indent*/ ) const
{
return Xmlcode::writeEntry (str, m_entry);
}
@@ -226,7 +226,7 @@
}
std::ostream &
-YCPReferenceRep::toXml( std::ostream & str, int indent ) const
+YCPReferenceRep::toXml( std::ostream & str, int /*indent*/ ) const
{
// this is not used, instead YEVariable is used for xml
return str;
@@ -235,13 +235,13 @@
std::ostream &
-YCPBreakRep::toXml( std::ostream & str, int indent ) const
+YCPBreakRep::toXml( std::ostream & str, int /*indent*/ ) const
{
return str << "<break/>";
}
std::ostream &
-YCPReturnRep::toXml( std::ostream & str, int indent ) const
+YCPReturnRep::toXml( std::ostream & str, int /*indent*/ ) const
{
return str << "<return/>";
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-core-2.21.0/libycp/src/YCPExternal.cc
new/yast2-core-2.21.2/libycp/src/YCPExternal.cc
--- old/yast2-core-2.21.0/libycp/src/YCPExternal.cc 2009-12-18
14:51:23.000000000 +0100
+++ new/yast2-core-2.21.2/libycp/src/YCPExternal.cc 2011-05-26
18:18:07.000000000 +0200
@@ -78,7 +78,7 @@
}
std::ostream &
-YCPExternalRep::toXml (std::ostream & str, int indent ) const
+YCPExternalRep::toXml (std::ostream & str, int /*indent*/ ) const
{
y2error ("Trying to store an external payload in xml");
return str;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-core-2.21.0/libycp/src/YCPFloat.cc
new/yast2-core-2.21.2/libycp/src/YCPFloat.cc
--- old/yast2-core-2.21.0/libycp/src/YCPFloat.cc 2009-12-18
14:51:23.000000000 +0100
+++ new/yast2-core-2.21.2/libycp/src/YCPFloat.cc 2011-05-26
18:18:10.000000000 +0200
@@ -100,7 +100,7 @@
}
std::ostream &
-YCPFloatRep::toXml (std::ostream & str, int indent ) const
+YCPFloatRep::toXml (std::ostream & str, int /*indent*/ ) const
{
return str << "<const type=\"float\" value=\"" << toString() << "\"/>";
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-core-2.21.0/libycp/src/YCPInteger.cc
new/yast2-core-2.21.2/libycp/src/YCPInteger.cc
--- old/yast2-core-2.21.0/libycp/src/YCPInteger.cc 2009-12-18
14:51:23.000000000 +0100
+++ new/yast2-core-2.21.2/libycp/src/YCPInteger.cc 2011-05-26
18:18:09.000000000 +0200
@@ -112,7 +112,7 @@
std::ostream &
-YCPIntegerRep::toXml (std::ostream & str, int indent ) const
+YCPIntegerRep::toXml (std::ostream & str, int /*indent*/ ) const
{
return str << "<const type=\"int\" value=\"" << v << "\"/>";
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-core-2.21.0/libycp/src/YCPString.cc
new/yast2-core-2.21.2/libycp/src/YCPString.cc
--- old/yast2-core-2.21.0/libycp/src/YCPString.cc 2009-12-18
14:51:23.000000000 +0100
+++ new/yast2-core-2.21.2/libycp/src/YCPString.cc 2011-05-26
18:18:08.000000000 +0200
@@ -132,7 +132,7 @@
std::ostream &
-YCPStringRep::toXml (std::ostream & str, int indent ) const
+YCPStringRep::toXml (std::ostream & str, int /*indent*/ ) const
{
return str << "<const type=\"string\" value=\"" << Xmlcode::xmlify(v) <<
"\"/>";
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-core-2.21.0/libycp/src/YCPSymbol.cc
new/yast2-core-2.21.2/libycp/src/YCPSymbol.cc
--- old/yast2-core-2.21.0/libycp/src/YCPSymbol.cc 2009-12-18
14:51:23.000000000 +0100
+++ new/yast2-core-2.21.2/libycp/src/YCPSymbol.cc 2011-05-26
18:18:08.000000000 +0200
@@ -83,7 +83,7 @@
}
std::ostream &
-YCPSymbolRep::toXml (std::ostream & str, int indent ) const
+YCPSymbolRep::toXml (std::ostream & str, int /*indent*/ ) const
{
str << "<const type=\"symbol\" value=\"" << v.asString() << "\"/>";
return str;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-core-2.21.0/libycp/src/YCPVoid.cc
new/yast2-core-2.21.2/libycp/src/YCPVoid.cc
--- old/yast2-core-2.21.0/libycp/src/YCPVoid.cc 2009-12-18 14:51:23.000000000
+0100
+++ new/yast2-core-2.21.2/libycp/src/YCPVoid.cc 2011-05-26 18:18:07.000000000
+0200
@@ -59,7 +59,7 @@
}
std::ostream &
-YCPVoidRep::toXml (std::ostream & str, int indent ) const
+YCPVoidRep::toXml (std::ostream & str, int /*indent*/ ) const
{
return str << "<const type=\"void\"/>";
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-core-2.21.0/libycp/src/YCode.cc
new/yast2-core-2.21.2/libycp/src/YCode.cc
--- old/yast2-core-2.21.0/libycp/src/YCode.cc 2009-12-18 14:51:23.000000000
+0100
+++ new/yast2-core-2.21.2/libycp/src/YCode.cc 2011-05-26 18:18:06.000000000
+0200
@@ -198,7 +198,7 @@
std::ostream &
-YCode::toXml (std::ostream & str, int indent ) const
+YCode::toXml (std::ostream & str, int /*indent*/ ) const
{
ykind k = kind ();
#if DO_DEBUG
@@ -403,7 +403,7 @@
}
std::ostream &
-YConst::toXml (std::ostream & str, int indent ) const
+YConst::toXml (std::ostream & str, int /*indent*/ ) const
{
if (m_kind == ycConstant) {
y2error ("Internal error, a constant not supposed to be written to
xml");
@@ -509,7 +509,7 @@
// see also YELocale::toXml
std::ostream &
-YLocale::toXml (std::ostream & str, int indent ) const
+YLocale::toXml (std::ostream & str, int /*indent*/ ) const
{
str << "<locale domain=\"" << m_domain->first << "\" text=\"" <<
Xmlcode::xmlify( m_locale ) << "\"/>";
return str;
@@ -781,7 +781,7 @@
std::ostream &
-YFunction::toXmlDefinition (std::ostream & str, int indent ) const
+YFunction::toXmlDefinition (std::ostream & str, int /*indent*/ ) const
{
// see toXml(...)
return str;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-core-2.21.0/libycp/src/YExpression.cc
new/yast2-core-2.21.2/libycp/src/YExpression.cc
--- old/yast2-core-2.21.0/libycp/src/YExpression.cc 2009-12-18
14:51:23.000000000 +0100
+++ new/yast2-core-2.21.2/libycp/src/YExpression.cc 2011-05-26
18:46:03.000000000 +0200
@@ -145,7 +145,7 @@
}
std::ostream &
-YEVariable::toXml( std::ostream & str, int indent ) const
+YEVariable::toXml( std::ostream & str, int /*indent*/ ) const
{
str << "<variable name=\"";
str << m_entry->toString (false /*definition*/);
@@ -217,7 +217,7 @@
std::ostream &
-YEReference::toXml (std::ostream & str, int indent ) const
+YEReference::toXml (std::ostream & str, int /*indent*/ ) const
{
str << "<yereference>";
Xmlcode::writeEntry (str, m_entry);
@@ -388,7 +388,7 @@
}
std::ostream &
-YETerm::toXml (std::ostream & str, int indent ) const
+YETerm::toXml (std::ostream & str, int /*indent*/ ) const
{
u_int32_t count = 0;
const ycodelist_t *codep = m_parameters;
@@ -533,7 +533,7 @@
std::ostream &
-YECompare::toXml (std::ostream & str, int indent ) const
+YECompare::toXml (std::ostream & str, int /*indent*/ ) const
{
str << "<compare op=\"" << Xmlcode::xmlify( compare_op_string( m_op ) ) <<
"\">";
str << "<lhs>"; m_left->toXml( str, 0 ); str << "</lhs>";
@@ -646,7 +646,7 @@
// see also YLocale::toXml
std::ostream &
-YELocale::toXml (std::ostream & str, int indent ) const
+YELocale::toXml (std::ostream & str, int /*indent*/ ) const
{
str << "<locale domain=\"" << m_domain->first << "\" text=\"" <<
Xmlcode::xmlify( m_singular )
<< "\" plural=\"" << Xmlcode::xmlify( m_plural ) << "\">";
@@ -741,13 +741,15 @@
YCPValue value = element->code->evaluate (cse);
if (value.isNull())
- {
- return value;
- }
- else
- {
- list->add (value);
+ {
+ if (cse) {
+ return value; // expression is not a constant
+ }
+ else {
+ value = YCPVoid();
+ }
}
+ list->add (value);
element = element->next;
}
return list;
@@ -790,7 +792,7 @@
std::ostream &
-YEList::toXml (std::ostream & str, int indent ) const
+YEList::toXml (std::ostream & str, int /*indent*/ ) const
{
u_int32_t count = 0;
const ycodelist_t *codep = m_first;
@@ -965,7 +967,7 @@
std::ostream &
-YEMap::toXml( std::ostream & str, int indent ) const
+YEMap::toXml( std::ostream & str, int /*indent*/ ) const
{
mapval_t *mapp = m_first;
u_int32_t count = 0;
@@ -1197,7 +1199,7 @@
}
std::ostream &
-YEPropagate::toXml (std::ostream & str, int indent ) const
+YEPropagate::toXml (std::ostream & str, int /*indent*/ ) const
{
str << "<yepropagate from=\"" << Xmlcode::xmlify( m_from->toString() ) <<
"\" to=\"" << Xmlcode::xmlify( m_to->toString() ) << "\">";
m_value->toXml( str, 0 );
@@ -1297,7 +1299,7 @@
std::ostream &
-YEUnary::toXml (std::ostream & str, int indent ) const
+YEUnary::toXml (std::ostream & str, int /*indent*/ ) const
{
str << "<yeunary";
extern StaticDeclaration static_declarations;
@@ -1412,7 +1414,7 @@
std::ostream &
-YEBinary::toXml (std::ostream & str, int indent ) const
+YEBinary::toXml (std::ostream & str, int /*indent*/ ) const
{
str << "<yebinary";
extern StaticDeclaration static_declarations;
@@ -1531,7 +1533,7 @@
std::ostream &
-YETriple::toXml (std::ostream & str, int indent ) const
+YETriple::toXml (std::ostream & str, int /*indent*/ ) const
{
str << "<yetriple>";
str << "<cond>"; m_expr->toXml( str, 0); str << "</cond>";
@@ -1638,7 +1640,7 @@
std::ostream &
-YEIs::toXml (std::ostream & str, int indent ) const
+YEIs::toXml (std::ostream & str, int /*indent*/ ) const
{
str << "<yeis "; m_type->toXml( str, 0); str << ">";
str << "<expr>"; m_expr->toXml( str, 0); str << "</expr>";
@@ -1693,7 +1695,7 @@
}
std::ostream &
-YEReturn::toXml (std::ostream & str, int indent ) const
+YEReturn::toXml (std::ostream & str, int /*indent*/ ) const
{
str << "<yereturn>";
m_expr->toXml( str, 0 );
@@ -1864,7 +1866,7 @@
std::ostream &
-YEBracket::toXml (std::ostream & str, int indent ) const
+YEBracket::toXml (std::ostream & str, int /*indent*/ ) const
{
str << "<yebracket ";
m_resultType->toXml( str, 0);
@@ -2991,7 +2993,7 @@
std::ostream &
-YECall::toXml (std::ostream & str, int indent ) const
+YECall::toXml (std::ostream & str, int /*indent*/ ) const
{
str << "<call";
if (!m_sentry->nameSpace()->name().empty()) {
@@ -3117,7 +3119,7 @@
if (ee.endlessRecursion ())
{
- y2error ("Returning nil instead of calling the function.");
+ ycp2error ("Returning nil instead of calling the function.");
return YCPVoid ();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-core-2.21.0/libycp/src/YStatement.cc
new/yast2-core-2.21.2/libycp/src/YStatement.cc
--- old/yast2-core-2.21.0/libycp/src/YStatement.cc 2009-12-18
14:51:23.000000000 +0100
+++ new/yast2-core-2.21.2/libycp/src/YStatement.cc 2011-05-26
18:21:52.000000000 +0200
@@ -116,7 +116,7 @@
}
std::ostream &
-YStatement::toXml( std::ostream & str, int indent ) const
+YStatement::toXml( std::ostream & str, int /*indent*/ ) const
{
return str << "<statement line=" << m_line << "/>";
}
@@ -160,7 +160,7 @@
}
std::ostream &
-YSBreak::toXml (std::ostream & str, int indent ) const
+YSBreak::toXml (std::ostream & str, int /*indent*/ ) const
{
return str << "<break/>";
}
@@ -204,7 +204,7 @@
}
std::ostream &
-YSContinue::toXml (std::ostream & str, int indent ) const
+YSContinue::toXml (std::ostream & str, int /*indent*/ ) const
{
return str << "<continue/>";
}
@@ -571,7 +571,7 @@
std::ostream &
-YSTypedef::toXml( std::ostream & str, int indent ) const
+YSTypedef::toXml( std::ostream & str, int /*indent*/ ) const
{
str << "<typedef name=\"" << m_name << "\"";
m_type->toXml( str, 0 );
@@ -635,7 +635,7 @@
std::ostream &
-YSAssign::toXml( std::ostream & str, int indent ) const
+YSAssign::toXml( std::ostream & str, int /*indent*/ ) const
{
str << "<assign name=\"" << m_entry->toString (false /*definition*/) <<
"\">";
m_code->toXml( str, 0 );
@@ -1553,7 +1553,7 @@
std::ostream &
-YSTextdomain::toXml (std::ostream & str, int indent ) const
+YSTextdomain::toXml (std::ostream & str, int /*indent*/ ) const
{
return str << "<textdomain name=\"" << m_domain.asString() << "\"/>";
}
@@ -1616,7 +1616,7 @@
std::ostream &
-YSInclude::toXml( std::ostream & str, int indent ) const
+YSInclude::toXml( std::ostream & str, int /*indent*/ ) const
{
str << "<include";
if (m_skipped) str << " skipped=\"1\"";
@@ -1774,7 +1774,7 @@
std::ostream &
-YSImport::toXml( std::ostream & str, int indent ) const
+YSImport::toXml( std::ostream & str, int /*indent*/ ) const
{
Xmlcode::pushNamespace (nameSpace()); // see
YBlock::toXml(str) for popUptoNamespace()
return str << "<import name=\"" << m_name.asString() << "\"/>";
@@ -1838,7 +1838,7 @@
std::ostream &
-YSFilename::toXml(std::ostream & str, int indent ) const
+YSFilename::toXml(std::ostream & str, int /*indent*/ ) const
{
return str << "<filename name=\"" << m_filename.asString() << "\"/>";
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-core-2.21.0/libycp/testsuite/tests/builtin/Builtin_VIII.out
new/yast2-core-2.21.2/libycp/testsuite/tests/builtin/Builtin_VIII.out
--- old/yast2-core-2.21.0/libycp/testsuite/tests/builtin/Builtin_VIII.out
2009-12-18 14:51:25.000000000 +0100
+++ new/yast2-core-2.21.2/libycp/testsuite/tests/builtin/Builtin_VIII.out
2011-05-27 16:56:00.000000000 +0200
@@ -22,7 +22,7 @@
("1.02")
("1,02")
("1024.09")
-("1�024,09")
+("1 024,09")
(true)
(true)
(true)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-core-2.21.0/libycp/testsuite/tests/statements/deep_recursion.err
new/yast2-core-2.21.2/libycp/testsuite/tests/statements/deep_recursion.err
--- old/yast2-core-2.21.0/libycp/testsuite/tests/statements/deep_recursion.err
2009-12-18 14:51:24.000000000 +0100
+++ new/yast2-core-2.21.2/libycp/testsuite/tests/statements/deep_recursion.err
2011-05-26 17:59:07.000000000 +0200
@@ -14,7 +14,7 @@
}
----------------------------------------------------------------------
[libycp] ExecutionEnvironment.cc(endlessRecursion):96 Recursion limit of 1001
call frames reached. Set the environment variable Y2RECURSIONLIMIT to change
this
-[libycp] YExpression.cc(evaluate):3120 Returning nil instead of calling the
function.
+[Interpreter] tests/statements/deep_recursion.ycp:5 Returning nil instead of
calling the function.
[Interpreter] tests/statements/deep_recursion.ycp:5 Argument (Multiply ((a -
1), b)) to +(...) evaluates to nil
[Interpreter] tests/statements/deep_recursion.ycp:5 Argument (Multiply ((a -
1), b)) to +(...) evaluates to nil
[Interpreter] tests/statements/deep_recursion.ycp:5 Argument (Multiply ((a -
1), b)) to +(...) evaluates to nil
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-core-2.21.0/libycp/testsuite/tests/values/List2.err
new/yast2-core-2.21.2/libycp/testsuite/tests/values/List2.err
--- old/yast2-core-2.21.0/libycp/testsuite/tests/values/List2.err
1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-core-2.21.2/libycp/testsuite/tests/values/List2.err
2011-05-26 18:53:18.000000000 +0200
@@ -0,0 +1,11 @@
+Parsed:
+----------------------------------------------------------------------
+{
+ // list l
+ // filename: "tests/values/List2.ycp"
+ list l = nil;
+ l = add (l, 42);
+ return ["a nil list should not crash on add:", l];
+}
+----------------------------------------------------------------------
+[Interpreter] tests/values/List2.ycp:4 Adding to a nil list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-core-2.21.0/libycp/testsuite/tests/values/List2.out
new/yast2-core-2.21.2/libycp/testsuite/tests/values/List2.out
--- old/yast2-core-2.21.0/libycp/testsuite/tests/values/List2.out
1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-core-2.21.2/libycp/testsuite/tests/values/List2.out
2011-05-26 17:34:48.000000000 +0200
@@ -0,0 +1 @@
+(["a nil list should not crash on add:", nil])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-core-2.21.0/libycp/testsuite/tests/values/List2.ycp
new/yast2-core-2.21.2/libycp/testsuite/tests/values/List2.ycp
--- old/yast2-core-2.21.0/libycp/testsuite/tests/values/List2.ycp
1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-core-2.21.2/libycp/testsuite/tests/values/List2.ycp
2011-05-26 17:12:06.000000000 +0200
@@ -0,0 +1,6 @@
+// bnc#694520
+{
+ list l = nil;
+ l = add (l, 42);
+ return ["a nil list should not crash on add:", l];
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-core-2.21.0/libycp/testsuite/tests/values/List3.err
new/yast2-core-2.21.2/libycp/testsuite/tests/values/List3.err
--- old/yast2-core-2.21.0/libycp/testsuite/tests/values/List3.err
1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-core-2.21.2/libycp/testsuite/tests/values/List3.err
2011-05-26 17:25:05.000000000 +0200
@@ -0,0 +1,12 @@
+Parsed:
+----------------------------------------------------------------------
+{
+ // any number
+ // list <string> l
+ // filename: "tests/values/List3.ycp"
+ any number = 42;
+ list <string> l = ["an invalid element in a list literal:", /* any ->
string */number, "should not invalidate the entire list"];
+ return l;
+}
+----------------------------------------------------------------------
+[Interpreter] tests/values/List3.ycp:4 Can't convert value '42' to type
'string'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-core-2.21.0/libycp/testsuite/tests/values/List3.out
new/yast2-core-2.21.2/libycp/testsuite/tests/values/List3.out
--- old/yast2-core-2.21.0/libycp/testsuite/tests/values/List3.out
1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-core-2.21.2/libycp/testsuite/tests/values/List3.out
2011-05-26 17:29:43.000000000 +0200
@@ -0,0 +1 @@
+(["an invalid element in a list literal:", nil, "should not invalidate the
entire list"])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-core-2.21.0/libycp/testsuite/tests/values/List3.ycp
new/yast2-core-2.21.2/libycp/testsuite/tests/values/List3.ycp
--- old/yast2-core-2.21.0/libycp/testsuite/tests/values/List3.ycp
1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-core-2.21.2/libycp/testsuite/tests/values/List3.ycp
2011-05-26 17:21:52.000000000 +0200
@@ -0,0 +1,8 @@
+// bnc#694520
+{
+ any number = 42;
+ list<string> l = ["an invalid element in a list literal:",
+ (string) number, // fails
+ "should not invalidate the entire list"];
+ return l;
+}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
