Hello community,
here is the log from the commit of package yast2-pkg-bindings for openSUSE:Factory checked in at Thu Jan 29 01:34:48 CET 2009.
-------- --- yast2-pkg-bindings/yast2-pkg-bindings.changes 2009-01-16 20:01:46.000000000 +0100 +++ yast2-pkg-bindings/yast2-pkg-bindings.changes 2009-01-28 14:29:31.846055000 +0100 @@ -1,0 +2,14 @@ +Wed Jan 28 14:11:58 CET 2009 - lslezak@suse.cz + +- Fixed Pkg::SetSolverFlags() function - properly set + "ignoreAlreadyRecommended" flag, do not select extra packages for + installation (bnc#470185) +- 2.18.2 + +------------------------------------------------------------------- +Mon Jan 26 16:26:46 CET 2009 - lslezak@suse.cz + +- implemented RemoveResolvableReport::problem() callback, do not + abort when [Ignore] is pressed (bnc#465641) + +-------------------------------------------------------------------
calling whatdependson for head-i586
Old: ---- yast2-pkg-bindings-2.18.1.tar.bz2
New: ---- yast2-pkg-bindings-2.18.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences: ------------------ ++++++ yast2-pkg-bindings-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.Sa7783/_old 2009-01-29 01:33:51.000000000 +0100 +++ /var/tmp/diff_new_pack.Sa7783/_new 2009-01-29 01:33:51.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-pkg-bindings-devel-doc (Version 2.18.1) +# spec file for package yast2-pkg-bindings-devel-doc (Version 2.18.2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@
Name: yast2-pkg-bindings-devel-doc -Version: 2.18.1 +Version: 2.18.2 Release: 1 License: GPL v2 or later Group: Documentation/HTML BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-pkg-bindings-2.18.1.tar.bz2 +Source0: yast2-pkg-bindings-2.18.2.tar.bz2 Prefix: %_prefix # same as in the main package (because we use the same configure.in.in) BuildRequires: blocxx-devel docbook-xsl-stylesheets doxygen gcc-c++ libgcrypt-devel libxcrypt-devel libxslt libzypp-devel perl-XML-Writer sgml-skel yast2-core-devel yast2-devtools @@ -45,7 +45,7 @@ Ladislav Slez�k lslezak@novell.com
%prep -%setup -n yast2-pkg-bindings-2.18.1 +%setup -n yast2-pkg-bindings-2.18.2 # build only documentation, ignore all other directories echo "doc" > SUBDIRS
++++++ yast2-pkg-bindings.spec ++++++ --- /var/tmp/diff_new_pack.Sa7783/_old 2009-01-29 01:33:51.000000000 +0100 +++ /var/tmp/diff_new_pack.Sa7783/_new 2009-01-29 01:33:51.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-pkg-bindings (Version 2.18.1) +# spec file for package yast2-pkg-bindings (Version 2.18.2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@
Name: yast2-pkg-bindings -Version: 2.18.1 +Version: 2.18.2 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-pkg-bindings-2.18.1.tar.bz2 +Source0: yast2-pkg-bindings-2.18.2.tar.bz2 Prefix: /usr BuildRequires: blocxx-devel docbook-xsl-stylesheets doxygen gcc-c++ libgcrypt-devel libxcrypt-devel libxslt perl-XML-Writer sgml-skel yast2-core-devel yast2-devtools BuildRequires: libzypp-devel >= 5.24.7 @@ -47,7 +47,7 @@ Stanislav Visnovsky visnov@suse.cz
%prep -%setup -n yast2-pkg-bindings-2.18.1 +%setup -n yast2-pkg-bindings-2.18.2 # build only the library, ignore documentation (it is in devel-doc package) echo "src" > SUBDIRS
@@ -79,6 +79,14 @@ %{_libdir}/YaST2/plugin/libpy2Pkg.so %doc %{prefix}/share/doc/packages/yast2-pkg-bindings %changelog +* Wed Jan 28 2009 lslezak@suse.cz +- Fixed Pkg::SetSolverFlags() function - properly set + "ignoreAlreadyRecommended" flag, do not select extra packages for + installation (bnc#470185) +- 2.18.2 +* Mon Jan 26 2009 lslezak@suse.cz +- implemented RemoveResolvableReport::problem() callback, do not + abort when [Ignore] is pressed (bnc#465641) * Fri Jan 16 2009 lslezak@suse.cz - 2.18.1 * Thu Jan 15 2009 lslezak@suse.cz
++++++ yast2-pkg-bindings-2.18.1.tar.bz2 -> yast2-pkg-bindings-2.18.2.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.18.1/configure new/yast2-pkg-bindings-2.18.2/configure --- old/yast2-pkg-bindings-2.18.1/configure 2009-01-16 19:58:03.000000000 +0100 +++ new/yast2-pkg-bindings-2.18.2/configure 2009-01-28 14:27:57.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for yast2-pkg-bindings 2.18.1. +# Generated by GNU Autoconf 2.63 for yast2-pkg-bindings 2.18.2. # # Report bugs to http://bugs.opensuse.org/. # @@ -745,8 +745,8 @@ # Identity of this package. PACKAGE_NAME='yast2-pkg-bindings' PACKAGE_TARNAME='yast2-pkg-bindings' -PACKAGE_VERSION='2.18.1' -PACKAGE_STRING='yast2-pkg-bindings 2.18.1' +PACKAGE_VERSION='2.18.2' +PACKAGE_STRING='yast2-pkg-bindings 2.18.2' PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME" @@ -1536,7 +1536,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-pkg-bindings 2.18.1 to adapt to many kinds of systems. +`configure' configures yast2-pkg-bindings 2.18.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1608,7 +1608,7 @@
if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-pkg-bindings 2.18.1:";; + short | recursive ) echo "Configuration of yast2-pkg-bindings 2.18.2:";; esac cat <<_ACEOF
@@ -1720,7 +1720,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<_ACEOF -yast2-pkg-bindings configure 2.18.1 +yast2-pkg-bindings configure 2.18.2 generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1734,7 +1734,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-pkg-bindings $as_me 2.18.1, which was +It was created by yast2-pkg-bindings $as_me 2.18.2, which was generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@ @@ -2581,7 +2581,7 @@
# Define the identity of the package. PACKAGE='yast2-pkg-bindings' - VERSION='2.18.1' + VERSION='2.18.2'
cat >>confdefs.h <<_ACEOF @@ -2805,7 +2805,7 @@
-VERSION="2.18.1" +VERSION="2.18.2" RPMNAME="yast2-pkg-bindings" MAINTAINER="Ladislav Slezák lslezak@suse.cz"
@@ -17209,7 +17209,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-pkg-bindings $as_me 2.18.1, which was +This file was extended by yast2-pkg-bindings $as_me 2.18.2, which was generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES @@ -17272,7 +17272,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\ -yast2-pkg-bindings config.status 2.18.1 +yast2-pkg-bindings config.status 2.18.2 configured by $0, generated by GNU Autoconf 2.63, with options \"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\""`$]/\\&/g'`\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.18.1/configure.in new/yast2-pkg-bindings-2.18.2/configure.in --- old/yast2-pkg-bindings-2.18.1/configure.in 2009-01-16 19:57:48.000000000 +0100 +++ new/yast2-pkg-bindings-2.18.2/configure.in 2009-01-28 14:27:44.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! -- dnl (edit configure.in.in instead)
-AC_INIT(yast2-pkg-bindings, 2.18.1, http://bugs.opensuse.org/, yast2-pkg-bindings) +AC_INIT(yast2-pkg-bindings, 2.18.2, http://bugs.opensuse.org/, yast2-pkg-bindings) 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.18.1" +VERSION="2.18.2" RPMNAME="yast2-pkg-bindings" MAINTAINER="Ladislav Slezák lslezak@suse.cz"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.18.1/src/Callbacks.cc new/yast2-pkg-bindings-2.18.2/src/Callbacks.cc --- old/yast2-pkg-bindings-2.18.1/src/Callbacks.cc 2008-11-28 17:31:24.000000000 +0100 +++ new/yast2-pkg-bindings-2.18.2/src/Callbacks.cc 2009-01-26 16:07:53.000000000 +0100 @@ -438,6 +438,33 @@ return zypp::target::rpm::RemoveResolvableReport::progress(value, resolvable); }
+ virtual Action problem( + zypp::Resolvable::constPtr resolvable + , zypp::target::rpm::RemoveResolvableReport::Error error + , const std::string &description + ) + { + CB callback( ycpcb( YCPCallbacks::CB_DonePackage) ); + if (callback._set) { + callback.addInt( error ); + callback.addStr( description ); + + std::string ret = callback.evaluateStr(); + + // "R" = retry + if (ret == "R") return zypp::target::rpm::RemoveResolvableReport::RETRY; + + // "C" = cancel + if (ret == "C") return zypp::target::rpm::RemoveResolvableReport::ABORT; + + // otherwise ignore + return zypp::target::rpm::RemoveResolvableReport::IGNORE; + } + + return zypp::target::rpm::RemoveResolvableReport::problem + (resolvable, error, description); + } + virtual void finish(zypp::Resolvable::constPtr resolvable, zypp::target::rpm::RemoveResolvableReport::Error error, const std::string &reason) { CB callback( ycpcb( YCPCallbacks::CB_DonePackage) ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.18.1/src/Package.cc new/yast2-pkg-bindings-2.18.2/src/Package.cc --- old/yast2-pkg-bindings-2.18.1/src/Package.cc 2008-12-08 14:37:30.000000000 +0100 +++ new/yast2-pkg-bindings-2.18.2/src/Package.cc 2009-01-28 14:01:40.000000000 +0100 @@ -583,10 +583,6 @@ * @builtin PkgInstalled * * @short returns 'true' if the package is installed in the system - * @description - * tag can be a package name, a string from requires/provides - * or a file name (since a package implictly provides all its files) - * * @param string package name of the package * @return boolean * @usage Pkg::PkgInstalled("glibc") -> true @@ -1924,7 +1920,7 @@ const YCPString ignore_key("ignoreAlreadyRecommended"); if (!params.isNull() && !params->value(ignore_key).isNull() && params->value(ignore_key)->isBoolean()) { - bool ignoreAlreadyRecommended = zypp_ptr()->resolver()->ignoreAlreadyRecommended(); + bool ignoreAlreadyRecommended = params->value(ignore_key)->asBoolean()->value(); y2milestone("Setting solver flag ignoreAlreadyRecommended: %d", ignoreAlreadyRecommended); zypp_ptr()->resolver()->setIgnoreAlreadyRecommended(ignoreAlreadyRecommended); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.18.1/VERSION new/yast2-pkg-bindings-2.18.2/VERSION --- old/yast2-pkg-bindings-2.18.1/VERSION 2009-01-16 19:55:26.000000000 +0100 +++ new/yast2-pkg-bindings-2.18.2/VERSION 2009-01-28 14:12:43.000000000 +0100 @@ -1 +1 @@ -2.18.1 +2.18.2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...