Hello community,
here is the log from the commit of package yast2-core
checked in at Fri Oct 5 00:41:45 CEST 2007.
--------
--- yast2-core/yast2-core.changes 2007-10-02 16:30:21.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-core/yast2-core.changes 2007-10-04 15:08:31.000000000 +0200
@@ -0,0 +1,8 @@
+-------------------------------------------------------------------
+Thu Oct 4 15:03:52 CEST 2007 - mvidner@suse.cz
+
+- Distinguish "foo.ycp contains an error" from "foo.ycp not found"
+ (#330656).
+- 2.16.1
+
+-------------------------------------------------------------------
Old:
----
yast2-core-2.16.0.tar.bz2
New:
----
yast2-core-2.16.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-core.spec ++++++
--- /var/tmp/diff_new_pack.Tw3176/_old 2007-10-05 00:41:01.000000000 +0200
+++ /var/tmp/diff_new_pack.Tw3176/_new 2007-10-05 00:41:01.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-core (Version 2.16.0)
+# spec file for package yast2-core (Version 2.16.1)
#
# 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.0
+Version: 2.16.1
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-core-2.16.0.tar.bz2
+Source0: yast2-core-2.16.1.tar.bz2
Prefix: /usr
# obviously
BuildRequires: gcc-c++
@@ -122,7 +122,7 @@
Stanislav Visnovsky
%prep
-%setup -n yast2-core-2.16.0
+%setup -n yast2-core-2.16.1
%build
%{prefix}/bin/y2tool y2autoconf
@@ -199,6 +199,10 @@
%doc %{prefix}/share/doc/packages/yast2-core
/usr/share/YaST2/data/devtools/bin/generateYCPWrappers
%changelog
+* Thu Oct 04 2007 - mvidner@suse.cz
+- Distinguish "foo.ycp contains an error" from "foo.ycp not found"
+ (#330656).
+- 2.16.1
* Tue Oct 02 2007 - mvidner@suse.cz
- Close unneeded file descriptors before execing another
program (#223602).
++++++ yast2-core-2.16.0.tar.bz2 -> yast2-core-2.16.1.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-core-2.16.0/configure new/yast2-core-2.16.1/configure
--- old/yast2-core-2.16.0/configure 2007-10-02 16:31:19.000000000 +0200
+++ new/yast2-core-2.16.1/configure 2007-10-04 15:52:02.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for yast2-core 2.16.0.
+# Generated by GNU Autoconf 2.61 for yast2-core 2.16.1.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -728,8 +728,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-core'
PACKAGE_TARNAME='yast2-core'
-PACKAGE_VERSION='2.16.0'
-PACKAGE_STRING='yast2-core 2.16.0'
+PACKAGE_VERSION='2.16.1'
+PACKAGE_STRING='yast2-core 2.16.1'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1455,7 +1455,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-core 2.16.0 to adapt to many kinds of systems.
+\`configure' configures yast2-core 2.16.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1526,7 +1526,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-core 2.16.0:";;
+ short | recursive ) echo "Configuration of yast2-core 2.16.1:";;
esac
cat <<\_ACEOF
@@ -1637,7 +1637,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-core configure 2.16.0
+yast2-core configure 2.16.1
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1651,7 +1651,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-core $as_me 2.16.0, which was
+It was created by yast2-core $as_me 2.16.1, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2472,7 +2472,7 @@
# Define the identity of the package.
PACKAGE='yast2-core'
- VERSION='2.16.0'
+ VERSION='2.16.1'
cat >>confdefs.h <<_ACEOF
@@ -2699,7 +2699,7 @@
-VERSION="2.16.0"
+VERSION="2.16.1"
RPMNAME="yast2-core"
MAINTAINER="Martin Vidner "
@@ -23454,7 +23454,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-core $as_me 2.16.0, which was
+This file was extended by yast2-core $as_me 2.16.1, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -23507,7 +23507,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-core config.status 2.16.0
+yast2-core config.status 2.16.1
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-core-2.16.0/configure.in new/yast2-core-2.16.1/configure.in
--- old/yast2-core-2.16.0/configure.in 2007-10-02 16:30:42.000000000 +0200
+++ new/yast2-core-2.16.1/configure.in 2007-10-04 15:50:56.000000000 +0200
@@ -3,7 +3,7 @@
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.0, http://bugs.opensuse.org/, yast2-core)
+AC_INIT(yast2-core, 2.16.1, http://bugs.opensuse.org/, yast2-core)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.16.0"
+VERSION="2.16.1"
RPMNAME="yast2-core"
MAINTAINER="Martin Vidner "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-core-2.16.0/liby2/src/genericfrontend.cc new/yast2-core-2.16.1/liby2/src/genericfrontend.cc
--- old/yast2-core-2.16.0/liby2/src/genericfrontend.cc 2007-08-10 17:33:23.000000000 +0200
+++ new/yast2-core-2.16.1/liby2/src/genericfrontend.cc 2007-10-04 10:10:29.000000000 +0200
@@ -33,6 +33,7 @@
#include
#include
#include "Y2Component.h"
+#include "Y2ErrorComponent.h"
#include "Y2ComponentBroker.h"
#include
#include
@@ -538,6 +539,12 @@
print_usage ();
exit (5);
}
+ if (dynamic_cast(client))
+ {
+ print_error ("Error while creating client module %s", client_name);
+ exit (5);
+ }
+
// The environment variable YAST_IS_RUNNING is checked in rpm
// post install scripts. Might be useful for other scripts as
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-core-2.16.0/liby2/src/include/y2/Makefile.am new/yast2-core-2.16.1/liby2/src/include/y2/Makefile.am
--- old/yast2-core-2.16.0/liby2/src/include/y2/Makefile.am 2006-09-19 13:24:02.000000000 +0200
+++ new/yast2-core-2.16.1/liby2/src/include/y2/Makefile.am 2007-10-04 09:26:27.000000000 +0200
@@ -9,6 +9,7 @@
pkginclude_HEADERS = \
Y2Component.h Y2ComponentBroker.h Y2ComponentCreator.h \
Y2CCProgram.h Y2CCSerial.h Y2CCStdio.h \
+ Y2ErrorComponent.h \
Y2ProgramComponent.h \
Y2SerialComponent.h Y2StdioComponent.h \
Y2PluginComponent.h Y2CCPlugin.h \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-core-2.16.0/liby2/src/include/y2/Makefile.in new/yast2-core-2.16.1/liby2/src/include/y2/Makefile.in
--- old/yast2-core-2.16.0/liby2/src/include/y2/Makefile.in 2007-10-02 16:31:45.000000000 +0200
+++ new/yast2-core-2.16.1/liby2/src/include/y2/Makefile.in 2007-10-04 15:53:13.000000000 +0200
@@ -225,6 +225,7 @@
pkginclude_HEADERS = \
Y2Component.h Y2ComponentBroker.h Y2ComponentCreator.h \
Y2CCProgram.h Y2CCSerial.h Y2CCStdio.h \
+ Y2ErrorComponent.h \
Y2ProgramComponent.h \
Y2SerialComponent.h Y2StdioComponent.h \
Y2PluginComponent.h Y2CCPlugin.h \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-core-2.16.0/liby2/src/include/y2/Y2ErrorComponent.h new/yast2-core-2.16.1/liby2/src/include/y2/Y2ErrorComponent.h
--- old/yast2-core-2.16.0/liby2/src/include/y2/Y2ErrorComponent.h 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-core-2.16.1/liby2/src/include/y2/Y2ErrorComponent.h 2007-10-04 14:57:22.000000000 +0200
@@ -0,0 +1,52 @@
+/*-----------------------------------------------------------*- c++ -*-\
+| |
+| __ __ ____ _____ ____ |
+| \ \ / /_ _/ ___|_ _|___ \ |
+| \ V / _` \___ \ | | __) | |
+| | | (_| |___) || | / __/ |
+| |_|\__,_|____/ |_| |_____| |
+| |
+| core system |
+| (C) SuSE GmbH |
+\----------------------------------------------------------------------/
+
+ File: Y2ErrorComponent.h
+
+ Author: Martin Vidner
+
+/-*/
+
+/*
+ * Component that represents an error while creating another component
+ * (the component creator would otherwise keep trying while we want to cry foul)
+ *
+ * BTW we do not need a matching component creator because we do not
+ * WANT errors, they just happen, pesky things.
+ */
+
+#ifndef Y2ErrorComponent_h
+#define Y2ErrorComponent_h
+
+#include "Y2Component.h"
+
+/**
+ * @short A dummy component representing an error
+ */
+class Y2ErrorComponent : public Y2Component
+{
+public:
+
+ /**
+ * Constructor.
+ */
+ Y2ErrorComponent () {}
+
+ /**
+ * Returns "ErrorComponent".
+ */
+ string name() const { return "ErrorComponent"; }
+
+};
+
+
+#endif // Y2ErrorComponent_h
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-core-2.16.0/liby2/src/Makefile.am new/yast2-core-2.16.1/liby2/src/Makefile.am
--- old/yast2-core-2.16.0/liby2/src/Makefile.am 2006-09-19 13:24:04.000000000 +0200
+++ new/yast2-core-2.16.1/liby2/src/Makefile.am 2007-10-04 15:46:34.000000000 +0200
@@ -17,6 +17,7 @@
Y2LanguageLoader.cc \
genericfrontend.cc \
SymbolEntry.cc \
+ Y2ErrorComponent.cc \
Y2ProgramComponent.cc Y2CCProgram.cc \
Y2PluginComponent.cc Y2CCPlugin.cc \
Y2StdioComponent.cc Y2CCStdio.cc
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-core-2.16.0/liby2/src/Makefile.in new/yast2-core-2.16.1/liby2/src/Makefile.in
--- old/yast2-core-2.16.0/liby2/src/Makefile.in 2007-10-02 16:31:45.000000000 +0200
+++ new/yast2-core-2.16.1/liby2/src/Makefile.in 2007-10-04 15:53:12.000000000 +0200
@@ -66,9 +66,9 @@
liby2_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
am_liby2_la_OBJECTS = Y2Component.lo Y2ComponentBroker.lo \
Y2ComponentCreator.lo Y2Namespace.lo Y2LanguageLoader.lo \
- genericfrontend.lo SymbolEntry.lo Y2ProgramComponent.lo \
- Y2CCProgram.lo Y2PluginComponent.lo Y2CCPlugin.lo \
- Y2StdioComponent.lo Y2CCStdio.lo
+ genericfrontend.lo SymbolEntry.lo Y2ErrorComponent.lo \
+ Y2ProgramComponent.lo Y2CCProgram.lo Y2PluginComponent.lo \
+ Y2CCPlugin.lo Y2StdioComponent.lo Y2CCStdio.lo
liby2_la_OBJECTS = $(am_liby2_la_OBJECTS)
liby2_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
@@ -272,6 +272,7 @@
Y2LanguageLoader.cc \
genericfrontend.cc \
SymbolEntry.cc \
+ Y2ErrorComponent.cc \
Y2ProgramComponent.cc Y2CCProgram.cc \
Y2PluginComponent.cc Y2CCPlugin.cc \
Y2StdioComponent.cc Y2CCStdio.cc
@@ -395,6 +396,7 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Y2Component.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Y2ComponentBroker.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Y2ComponentCreator.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Y2ErrorComponent.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Y2LanguageLoader.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Y2Namespace.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Y2PluginComponent.Plo@am__quote@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-core-2.16.0/liby2/src/Y2ErrorComponent.cc new/yast2-core-2.16.1/liby2/src/Y2ErrorComponent.cc
--- old/yast2-core-2.16.0/liby2/src/Y2ErrorComponent.cc 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-core-2.16.1/liby2/src/Y2ErrorComponent.cc 2007-10-04 11:25:48.000000000 +0200
@@ -0,0 +1,24 @@
+/*---------------------------------------------------------------------\
+| |
+| __ __ ____ _____ ____ |
+| \ \ / /_ _/ ___|_ _|___ \ |
+| \ V / _` \___ \ | | __) | |
+| | | (_| |___) || | / __/ |
+| |_|\__,_|____/ |_| |_____| |
+| |
+| core system |
+| (C) SuSE GmbH |
+\----------------------------------------------------------------------/
+
+ File: Y2ErrorComponent.cc
+
+ Component that represents an error while creating another component
+
+ Author: Martin Vidner
+
+/-*/
+
+#include "Y2ErrorComponent.h"
+
+// the default implementation of doActualWork logs an error and returns nil,
+// which is fine for us
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-core-2.16.0/VERSION new/yast2-core-2.16.1/VERSION
--- old/yast2-core-2.16.0/VERSION 2007-10-02 15:51:50.000000000 +0200
+++ new/yast2-core-2.16.1/VERSION 2007-10-04 14:59:57.000000000 +0200
@@ -1 +1 @@
-2.16.0
+2.16.1
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-core-2.16.0/wfm/src/Y2CCWFM.cc new/yast2-core-2.16.1/wfm/src/Y2CCWFM.cc
--- old/yast2-core-2.16.0/wfm/src/Y2CCWFM.cc 2007-08-10 17:33:27.000000000 +0200
+++ new/yast2-core-2.16.1/wfm/src/Y2CCWFM.cc 2007-10-04 11:31:55.000000000 +0200
@@ -33,6 +33,7 @@
#include
#include
#include
+#include
#include
@@ -168,7 +169,9 @@
return s;
}
- return NULL;
+ // NULL would mean not found and the component broker would keep trying
+ // which means it would ignore errors in y2update (#330656)
+ return new Y2ErrorComponent ();
}
bool Y2CCWFM::isServerCreator() const
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org