Hello community,
here is the log from the commit of package yast2-pkg-bindings
checked in at Fri Oct 13 16:36:20 CEST 2006.
--------
--- yast2-pkg-bindings/yast2-pkg-bindings.changes 2006-09-22 14:54:13.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-pkg-bindings/yast2-pkg-bindings.changes 2006-10-13 09:31:40.000000000 +0200
@@ -1,0 +2,25 @@
+Fri Oct 13 08:21:54 CEST 2006 - lslezak@suse.cz
+
+- Fixed callback prototypes (revealed by -Woverloaded-virtual)
+- 2.13.98
+
+-------------------------------------------------------------------
+Thu Oct 12 16:51:13 CEST 2006 - mvidner@suse.cz
+
+- Use -Woverloaded-virtual to warn about mis-overriden callbacks
+
+-------------------------------------------------------------------
+Thu Oct 12 13:13:03 CEST 2006 - lslezak@suse.cz
+
+- fixed media change callback signature to match zypp library
+ (#210208)
+- 2.13.97
+
+-------------------------------------------------------------------
+Thu Sep 28 14:01:47 CEST 2006 - schubi@suse.de
+
+- patch autoselect: select only the latest needed patch if
+ patches are needed with the same name and different editions.
+ Bug: 206927
+
+-------------------------------------------------------------------
Old:
----
yast2-pkg-bindings-2.13.96.tar.bz2
New:
----
yast2-pkg-bindings-2.13.98.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-pkg-bindings.spec ++++++
--- /var/tmp/diff_new_pack.9rcrtY/_old 2006-10-13 16:36:07.000000000 +0200
+++ /var/tmp/diff_new_pack.9rcrtY/_new 2006-10-13 16:36:07.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-pkg-bindings (Version 2.13.96)
+# spec file for package yast2-pkg-bindings (Version 2.13.98)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-pkg-bindings
-Version: 2.13.96
-Release: 1
+Version: 2.13.98
+Release: 2
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-pkg-bindings-2.13.96.tar.bz2
+Source0: yast2-pkg-bindings-2.13.98.tar.bz2
prefix: /usr
BuildRequires: blocxx-devel boost boost-devel dbus-1-devel docbook-xsl-stylesheets doxygen gcc-c++ hal-devel libgcrypt-devel libxcrypt-devel libxslt perl-XML-Writer rpm-devel sgml-skel yast2-core-devel yast2-devtools
BuildRequires: libzypp-devel >= 2.1.0
@@ -40,7 +40,7 @@
Stanislav Visnovsky
%prep
-%setup -n yast2-pkg-bindings-2.13.96
+%setup -n yast2-pkg-bindings-2.13.98
%build
%{prefix}/bin/y2tool y2autoconf
@@ -71,6 +71,19 @@
%doc %{prefix}/share/doc/packages/yast2-pkg-bindings
%changelog -n yast2-pkg-bindings
+* Fri Oct 13 2006 - lslezak@suse.cz
+- Fixed callback prototypes (revealed by -Woverloaded-virtual)
+- 2.13.98
+* Thu Oct 12 2006 - mvidner@suse.cz
+- Use -Woverloaded-virtual to warn about mis-overriden callbacks
+* Thu Oct 12 2006 - lslezak@suse.cz
+- fixed media change callback signature to match zypp library
+ (#210208)
+- 2.13.97
+* Thu Sep 28 2006 - schubi@suse.de
+- patch autoselect: select only the latest needed patch if
+ patches are needed with the same name and different editions.
+ Bug: 206927
* Fri Sep 22 2006 - lslezak@suse.cz
- added missing download callback handlers (lost during
implementation of feature #1466)
++++++ yast2-pkg-bindings-2.13.96.tar.bz2 -> yast2-pkg-bindings-2.13.98.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.96/VERSION new/yast2-pkg-bindings-2.13.98/VERSION
--- old/yast2-pkg-bindings-2.13.96/VERSION 2006-09-22 14:44:06.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.98/VERSION 2006-10-13 08:23:10.000000000 +0200
@@ -1 +1 @@
-2.13.96
+2.13.98
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.96/configure new/yast2-pkg-bindings-2.13.98/configure
--- old/yast2-pkg-bindings-2.13.96/configure 2006-09-22 14:50:23.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.98/configure 2006-10-12 16:53:01.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for yast2-pkg-bindings 2.13.96.
+# Generated by GNU Autoconf 2.60 for yast2-pkg-bindings 2.13.97.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -713,8 +713,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-pkg-bindings'
PACKAGE_TARNAME='yast2-pkg-bindings'
-PACKAGE_VERSION='2.13.96'
-PACKAGE_STRING='yast2-pkg-bindings 2.13.96'
+PACKAGE_VERSION='2.13.97'
+PACKAGE_STRING='yast2-pkg-bindings 2.13.97'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1428,7 +1428,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.13.96 to adapt to many kinds of systems.
+\`configure' configures yast2-pkg-bindings 2.13.97 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1499,7 +1499,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-pkg-bindings 2.13.96:";;
+ short | recursive ) echo "Configuration of yast2-pkg-bindings 2.13.97:";;
esac
cat <<\_ACEOF
@@ -1607,7 +1607,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-pkg-bindings configure 2.13.96
+yast2-pkg-bindings configure 2.13.97
generated by GNU Autoconf 2.60
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1621,7 +1621,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.13.96, which was
+It was created by yast2-pkg-bindings $as_me 2.13.97, which was
generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -2422,7 +2422,7 @@
# Define the identity of the package.
PACKAGE='yast2-pkg-bindings'
- VERSION='2.13.96'
+ VERSION='2.13.97'
cat >>confdefs.h <<_ACEOF
@@ -2649,7 +2649,7 @@
-VERSION="2.13.96"
+VERSION="2.13.97"
RPMNAME="yast2-pkg-bindings"
MAINTAINER="Ladislav Slezák "
@@ -21609,7 +21609,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.13.96, which was
+This file was extended by yast2-pkg-bindings $as_me 2.13.97, which was
generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21662,7 +21662,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-pkg-bindings config.status 2.13.96
+yast2-pkg-bindings config.status 2.13.97
configured by $0, generated by GNU Autoconf 2.60,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.96/configure.in new/yast2-pkg-bindings-2.13.98/configure.in
--- old/yast2-pkg-bindings-2.13.96/configure.in 2006-09-22 14:50:11.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.98/configure.in 2006-10-12 16:52:49.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.13.22 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-pkg-bindings, 2.13.96, http://bugs.opensuse.org/, yast2-pkg-bindings)
+AC_INIT(yast2-pkg-bindings, 2.13.97, http://bugs.opensuse.org/, yast2-pkg-bindings)
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.13.96"
+VERSION="2.13.97"
RPMNAME="yast2-pkg-bindings"
MAINTAINER="Ladislav Slezák "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.96/pkg-bindings.pot new/yast2-pkg-bindings-2.13.98/pkg-bindings.pot
--- old/yast2-pkg-bindings-2.13.96/pkg-bindings.pot 2006-09-21 15:11:08.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.98/pkg-bindings.pot 1970-01-01 01:00:00.000000000 +0100
@@ -1,30 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-21 15:11+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: LANGUAGE \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: src/Source.cc:138 src/Source.cc:172 src/Source.cc:758 src/Source.cc:800
-msgid "Downloading files..."
-msgstr ""
-
-#: src/Source.cc:191 src/Source.cc:243 src/Source.cc:1245 src/Source.cc:1247
-#: src/Source.cc:1272 src/Source.cc:1274
-msgid "Parsing files..."
-msgstr ""
-
-#: src/Source.cc:700 src/Source.cc:728
-msgid "Downloading file..."
-msgstr ""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.96/src/Callbacks.cc new/yast2-pkg-bindings-2.13.98/src/Callbacks.cc
--- old/yast2-pkg-bindings-2.13.96/src/Callbacks.cc 2006-09-22 09:49:37.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.98/src/Callbacks.cc 2006-10-12 16:44:06.000000000 +0200
@@ -33,6 +33,7 @@
#include
#include
#include
+#include
#include
#include
@@ -114,7 +115,7 @@
return zypp::target::rpm::ConvertDBReport::progress(value, pth);
}
- virtual void finish(zypp::Pathname path, zypp::target::rpm::ConvertDBReport::Error error, std::string reason)
+ virtual void finish(zypp::Pathname path, zypp::target::rpm::ConvertDBReport::Error error, const std::string &reason)
{
CB callback( ycpcb( YCPCallbacks::CB_StopConvertDb ) );
if (callback._set) {
@@ -163,7 +164,7 @@
return zypp::target::rpm::RebuildDBReport::progress(value, pth);
}
- virtual void finish(zypp::Pathname path, zypp::target::rpm::RebuildDBReport::Error error, std::string reason)
+ virtual void finish(zypp::Pathname path, zypp::target::rpm::RebuildDBReport::Error error, const std::string &reason)
{
CB callback( ycpcb( YCPCallbacks::CB_StopRebuildDb ) );
if (callback._set) {
@@ -243,7 +244,7 @@
virtual Action problem(
zypp::Resolvable::constPtr resolvable
, zypp::target::rpm::InstallResolvableReport::Error error
- , std::string description
+ , const std::string &description
, zypp::target::rpm::InstallResolvableReport::RpmLevel level
)
{
@@ -334,7 +335,7 @@
return zypp::target::rpm::RemoveResolvableReport::progress(value, resolvable);
}
- virtual void finish(zypp::Resolvable::constPtr resolvable, zypp::target::rpm::RemoveResolvableReport::Error error, std::string reason)
+ virtual void finish(zypp::Resolvable::constPtr resolvable, zypp::target::rpm::RemoveResolvableReport::Error error, const std::string &reason)
{
CB callback( ycpcb( YCPCallbacks::CB_DonePackage) );
if (callback._set) {
@@ -729,7 +730,7 @@
{
MediaChangeReceive( RecipientCtl & construct_r ) : Recipient( construct_r ) {}
- virtual Action requestMedia(zypp::Source_Ref source, unsigned mediumNr, zypp::media::MediaChangeReport::Error error, std::string description)
+ virtual Action requestMedia(zypp::Source_Ref source, unsigned mediumNr, zypp::media::MediaChangeReport::Error error, const std::string &description)
{
if ( _silent_probing == MEDIA_CHANGE_DISABLE )
return zypp::media::MediaChangeReport::ABORT;
@@ -1298,27 +1299,27 @@
{
KeyRingSignal ( RecipientCtl & construct_r ) : Recipient( construct_r ) {}
- virtual void trustedKeyAdded( const zypp::KeyRing &keyring, const std::string &keyid, const std::string &keyname, const std::string &fingerprint )
+ virtual void trustedKeyAdded( const zypp::KeyRing &/*keyring*/, const zypp::PublicKey &key )
{
CB callback( ycpcb( YCPCallbacks::CB_TrustedKeyAdded) );
if (callback._set)
{
- callback.addStr(keyid);
- callback.addStr(keyname);
- callback.addStr(fingerprint);
+ callback.addStr(key.id());
+ callback.addStr(key.name());
+ callback.addStr(key.fingerprint());
}
}
- virtual void trustedKeyRemoved( const zypp::KeyRing &keyring, const std::string &keyid, const std::string &keyname, const std::string &fingerprint )
+ virtual void trustedKeyRemoved( const zypp::KeyRing &/*keyring*/, const zypp::PublicKey &key )
{
CB callback( ycpcb( YCPCallbacks::CB_TrustedKeyRemoved) );
if (callback._set)
{
- callback.addStr(keyid);
- callback.addStr(keyname);
- callback.addStr(fingerprint);
+ callback.addStr(key.id());
+ callback.addStr(key.name());
+ callback.addStr(key.fingerprint());
}
}
};
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.96/src/Makefile.am new/yast2-pkg-bindings-2.13.98/src/Makefile.am
--- old/yast2-pkg-bindings-2.13.96/src/Makefile.am 2006-06-29 08:53:04.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.98/src/Makefile.am 2006-10-12 16:51:39.000000000 +0200
@@ -2,10 +2,12 @@
# Makefile.am for core/wfm/src
#
+# -Woverloaded-virtual catches mis-overridden callbacks
AM_CXXFLAGS = -DY2LOG=\"wfm\" \
-DSUSEVERSION=\"${SUSEVERSION}\" \
-DLOCALEDIR=\"${localedir}\" \
-fno-inline \
+ -Woverloaded-virtual \
-DZYPP_BASE_LOGGER_LOGGROUP=\"pkgbindings\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.96/src/Makefile.in new/yast2-pkg-bindings-2.13.98/src/Makefile.in
--- old/yast2-pkg-bindings-2.13.96/src/Makefile.in 2006-09-22 14:50:27.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.98/src/Makefile.in 2006-10-12 16:53:05.000000000 +0200
@@ -241,10 +241,13 @@
ydatadir = @ydatadir@
yncludedir = @yncludedir@
ystartupdir = @ystartupdir@
+
+# -Woverloaded-virtual catches mis-overridden callbacks
AM_CXXFLAGS = -DY2LOG=\"wfm\" \
-DSUSEVERSION=\"${SUSEVERSION}\" \
-DLOCALEDIR=\"${localedir}\" \
-fno-inline \
+ -Woverloaded-virtual \
-DZYPP_BASE_LOGGER_LOGGROUP=\"pkgbindings\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.96/src/Package.cc new/yast2-pkg-bindings-2.13.98/src/Package.cc
--- old/yast2-pkg-bindings-2.13.96/src/Package.cc 2006-08-09 09:26:15.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.98/src/Package.cc 2006-10-12 10:45:36.000000000 +0200
@@ -542,9 +542,10 @@
zypp::Arch _architecture;
zypp::ResStatus::TransactByValue whoWantsIt;
std::string version;
+ bool onlyNeeded;
- ProvideProcess( zypp::Arch arch, const std::string &vers)
- : _architecture( arch ), whoWantsIt(zypp::ResStatus::APPL_HIGH), version(vers)
+ ProvideProcess( zypp::Arch arch, const std::string &vers, const bool oNeeded)
+ : _architecture( arch ), whoWantsIt(zypp::ResStatus::APPL_HIGH), version(vers), onlyNeeded(oNeeded)
{ }
bool operator()( zypp::PoolItem provider )
@@ -561,7 +562,8 @@
return true;
}
- if (!provider.status().isInstalled())
+ if (!provider.status().isInstalled()
+ && (!onlyNeeded || provider.status().isNeeded()) ) // take only needed items (e.G. needed patches)
{
// deselect the item if it's already selected,
// only one item should be selected
@@ -596,11 +598,12 @@
*/
bool
-PkgModuleFunctions::DoProvideNameKind( const std::string & name, zypp::Resolvable::Kind kind, zypp::Arch architecture, const std::string & version)
+PkgModuleFunctions::DoProvideNameKind( const std::string & name, zypp::Resolvable::Kind kind, zypp::Arch architecture,
+ const std::string & version ,const bool onlyNeeded)
{
try
{
- ProvideProcess info( architecture, version );
+ ProvideProcess info( architecture, version, onlyNeeded);
info.whoWantsIt = whoWantsIt;
invokeOnEach( zypp_ptr()->pool().byNameBegin( name ),
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.96/src/PkgModuleFunctions.h new/yast2-pkg-bindings-2.13.98/src/PkgModuleFunctions.h
--- old/yast2-pkg-bindings-2.13.96/src/PkgModuleFunctions.h 2006-09-18 09:57:59.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.98/src/PkgModuleFunctions.h 2006-10-12 10:45:38.000000000 +0200
@@ -80,7 +80,8 @@
private: // source related
- bool DoProvideNameKind( const std::string & name, zypp::Resolvable::Kind kind, zypp::Arch architecture, const std::string& version);
+ bool DoProvideNameKind( const std::string & name, zypp::Resolvable::Kind kind, zypp::Arch architecture,
+ const std::string& version, const bool onlyNeeded = false);
bool DoRemoveNameKind( const std::string & name, zypp::Resolvable::Kind kind);
bool DoProvideAllKind(zypp::Resolvable::Kind kind);
bool DoRemoveAllKind(zypp::Resolvable::Kind kind);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.96/src/Resolvable.cc new/yast2-pkg-bindings-2.13.98/src/Resolvable.cc
--- old/yast2-pkg-bindings-2.13.96/src/Resolvable.cc 2006-08-09 09:30:46.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.98/src/Resolvable.cc 2006-10-12 11:06:45.000000000 +0200
@@ -576,7 +576,11 @@
{
selected_patches++;
}
- else if (i->status().setTransact(true, whoWantsIt)) // schedule for installation
+ else if (DoProvideNameKind(pch->name(), pch->kind(), pch->arch(),"",
+ true // only Needed patches
+ ))
+ // schedule for installation
+ // but take the best edition. Bug #206927
{
stringstream str;
str << *i << endl;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.96/src/packages.pot new/yast2-pkg-bindings-2.13.98/src/packages.pot
--- old/yast2-pkg-bindings-2.13.96/src/packages.pot 2006-09-18 09:40:51.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.98/src/packages.pot 1970-01-01 01:00:00.000000000 +0100
@@ -1,29 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR , YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-18 09:40+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME \n"
-"Language-Team: LANGUAGE \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: Source.cc:112 Source.cc:158 Source.cc:810 Source.cc:864
-msgid "Downloading files..."
-msgstr ""
-
-#: Source.cc:191 Source.cc:256
-msgid "Parsing files..."
-msgstr ""
-
-#: Source.cc:727 Source.cc:766
-msgid "Downloading file..."
-msgstr ""
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org