Hello community,
here is the log from the commit of package yast2-core
checked in at Fri Nov 9 21:59:10 CET 2007.
--------
--- yast2-core/yast2-core.changes 2007-11-02 14:03:47.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-core/yast2-core.changes 2007-11-09 16:04:30.000000000 +0100
@@ -1,0 +2,7 @@
+Fri Nov 9 16:04:19 CET 2007 - mvidner@suse.cz
+
+- Allow nil in UI::ChangeWidget again (#340523). Improved error
+ reporting for cases where it is rightly disallowed.
+- 2.16.3
+
+-------------------------------------------------------------------
Old:
----
yast2-core-2.16.2.tar.bz2
New:
----
yast2-core-2.16.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-core.spec ++++++
--- /var/tmp/diff_new_pack.U22214/_old 2007-11-09 21:58:53.000000000 +0100
+++ /var/tmp/diff_new_pack.U22214/_new 2007-11-09 21:58:53.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-core (Version 2.16.2)
+# spec file for package yast2-core (Version 2.16.3)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-core
-Version: 2.16.2
+Version: 2.16.3
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-core-2.16.2.tar.bz2
+Source0: yast2-core-2.16.3.tar.bz2
Prefix: /usr
# obviously
BuildRequires: gcc-c++
@@ -122,7 +122,7 @@
Stanislav Visnovsky
%prep
-%setup -n yast2-core-2.16.2
+%setup -n yast2-core-2.16.3
%build
%{prefix}/bin/y2tool y2autoconf
@@ -199,6 +199,10 @@
%doc %{prefix}/share/doc/packages/yast2-core
/usr/share/YaST2/data/devtools/bin/generateYCPWrappers
%changelog
+* Fri Nov 09 2007 - mvidner@suse.cz
+- Allow nil in UI::ChangeWidget again (#340523). Improved error
+ reporting for cases where it is rightly disallowed.
+- 2.16.3
* Fri Nov 02 2007 - mvidner@suse.cz
- Do not look for YCP scripts under the current working
directory, unless explicitly requested (#330965).
++++++ yast2-core-2.16.2.tar.bz2 -> yast2-core-2.16.3.tar.bz2 ++++++
++++ 13461 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.16.2/base/tools/devtools/generateYCPWrappers new/yast2-core-2.16.3/base/tools/devtools/generateYCPWrappers
--- old/yast2-core-2.16.2/base/tools/devtools/generateYCPWrappers 2006-09-19 13:58:49.000000000 +0200
+++ new/yast2-core-2.16.3/base/tools/devtools/generateYCPWrappers 2007-11-09 16:02:32.000000000 +0100
@@ -1,5 +1,10 @@
#!/usr/bin/perl -w
+# example:
+# /* TYPEINFO: boolean (symbol, symbol, any) */
+# YCPValue ChangeWidget ( const YCPSymbol & widget_id, const YCPSymbol & property, const YCPValue & /*nil*/ new_value );
+
+
my $header_file = shift;
my $call_file = shift;
my $register_file = shift;
@@ -50,6 +55,11 @@
open ( CALL, "> $call_file" ) or die "Cannot open output file";
open ( REGISTER, "> $register_file" ) or die "Cannot open output file";
+my $generated = "\t// This file is generated by generateYCPwrappers from $header_file\n\n";
+print CALL $generated;
+print REGISTER $generated;
+
+print CALL "\t\tstatic const char * err_fmt = \"Parameter %d is nil, %s is required\";\n";
my $position = 0;
while (@exports)
@@ -66,21 +76,23 @@
while (@params)
{
- my @par = split (" ", shift (@params) );
- my $type = $par [0];
- if ( $type =~ /const/ )
- {
- $type = $par [1];
- }
- $type =~ s/^YCP(\w+)&?/$1/;
-
- push (@tests, "if (m_param$paramcount->isVoid()) {y2error(\"ERROR: Parameter $paramcount is nil, ".$type." is required\"); return YCPVoid();}");
-
- $type = "m_param" . $paramcount . "->as" . $type . "()" ;
- push @cppparams, $type;
- $paramcount++;
+ my $par = shift (@params);
+ $par =~ m{(const\s*)?YCP(\w+)\s*(&\s*)?(/\*nil\*/)?};
+ my $type = $2;
+ if (defined $4) { # #340523
+ push (@tests, "// m_param$paramcount may be nil");
+ }
+ else {
+ push (@tests, "if (m_param$paramcount->isVoid()) {ycp2error(err_fmt, $paramcount, \"$type\"); return YCPVoid();}");
+
+ }
+ $type = "m_param" . $paramcount . "->as" . $type . "()" ;
+ push @cppparams, $type;
+ $paramcount++;
}
- print CALL "\t\tcase $position: ". join (" ", @tests) . " return m_instance->$func_name (" . join (", ", @cppparams) . "); \n" ;
+ print CALL "\t\tcase $position: // $func_name\n" .
+ "\t\t\t". join ("\n\t\t\t", @tests) . "\n" .
+ "\t\t\treturn m_instance->$func_name (" . join (", ", @cppparams) . "); \n" ;
print REGISTER "\tenterSymbol (new SymbolEntry (this, $position, " ;
print REGISTER "\"$func_name\", SymbolEntry::c_function, Type::fromSignature (\"$signature\") ) );\n";
@@ -91,7 +103,3 @@
close ( CALL );
close ( REGISTER );
-
-
-0
-
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.16.2/configure.in new/yast2-core-2.16.3/configure.in
--- old/yast2-core-2.16.2/configure.in 2007-11-02 14:20:54.000000000 +0100
+++ new/yast2-core-2.16.3/configure.in 2007-11-09 16:35:07.000000000 +0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-core
dnl
-dnl -- This file is generated by y2autoconf 2.16.1 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.15.9 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-core, 2.16.2, http://bugs.opensuse.org/, yast2-core)
+AC_INIT(yast2-core, 2.16.3, http://bugs.opensuse.org/, yast2-core)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -14,11 +14,10 @@
AC_PREFIX_DEFAULT(/usr)
-dnl long filenames; we use GNU Make extensions and that's ok
-AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
+AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.16.2"
+VERSION="2.16.3"
RPMNAME="yast2-core"
MAINTAINER="Martin Vidner "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.16.2/libyui/src/Y2UINamespace.h new/yast2-core-2.16.3/libyui/src/Y2UINamespace.h
--- old/yast2-core-2.16.2/libyui/src/Y2UINamespace.h 2007-09-07 16:34:44.000000000 +0200
+++ new/yast2-core-2.16.3/libyui/src/Y2UINamespace.h 2007-11-09 14:43:29.000000000 +0100
@@ -180,17 +180,14 @@
/* TYPEINFO: boolean() */
YCPValue CloseDialog();
- // TODO DECL_NIL?
/* TYPEINFO: boolean (symbol, symbol, any) */
- YCPValue ChangeWidget ( const YCPSymbol & widget_id, const YCPSymbol & property, const YCPValue & new_value );
+ YCPValue ChangeWidget ( const YCPSymbol & widget_id, const YCPSymbol & property, const YCPValue & /*nil*/ new_value );
- // TODO DECL_NIL?
/* TYPEINFO: boolean (term, symbol, any) */
- YCPValue ChangeWidget ( const YCPTerm & widget_id, const YCPSymbol & property, const YCPValue & new_value );
+ YCPValue ChangeWidget ( const YCPTerm & widget_id, const YCPSymbol & property, const YCPValue & /*nil*/ new_value );
- // TODO DECL_NIL?
/* TYPEINFO: boolean (term, term, any) */
- YCPValue ChangeWidget ( const YCPTerm & widget_id, const YCPTerm & property, const YCPValue & new_value );
+ YCPValue ChangeWidget ( const YCPTerm & widget_id, const YCPTerm & property, const YCPValue & /*nil*/ new_value );
/* TYPEINFO: any (symbol, symbol) */
YCPValue QueryWidget ( const YCPSymbol & widget_id, const YCPSymbol & property );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.16.2/Makefile.am new/yast2-core-2.16.3/Makefile.am
--- old/yast2-core-2.16.2/Makefile.am 2007-11-02 14:20:54.000000000 +0100
+++ new/yast2-core-2.16.3/Makefile.am 2007-11-09 16:35:07.000000000 +0100
@@ -30,7 +30,6 @@
extra_COPYRIGHT_files = $(if $(HAS_YAST_LICENSE), $(COPYRIGHT_files_yast), $(COPYRIGHT_files_gpl))
-# less strict; prefer bzip2
AUTOMAKE_OPTIONS = foreign dist-bzip2 no-dist-gzip
# where devtools instal m4 snippets
# argh, executed literally
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-core-2.16.2/VERSION new/yast2-core-2.16.3/VERSION
--- old/yast2-core-2.16.2/VERSION 2007-11-02 14:03:26.000000000 +0100
+++ new/yast2-core-2.16.3/VERSION 2007-11-09 16:03:06.000000000 +0100
@@ -1 +1 @@
-2.16.2
+2.16.3
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org