Hello community,
here is the log from the commit of package yast2-pkg-bindings
checked in at Tue Apr 3 20:40:40 CEST 2007.
--------
--- yast2-pkg-bindings/yast2-pkg-bindings.changes 2007-02-21 17:56:43.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-pkg-bindings/yast2-pkg-bindings.changes 2007-04-02 14:26:18.681274000 +0200
@@ -1,0 +2,8 @@
+Mon Apr 2 13:58:44 CEST 2007 - lslezak@suse.cz
+
+- new callbacks Pkg::CallbackSourceCreateInit/Destroy() and
+ Pkg::CallbackSourceReportInit() - handle the ctor/dtor of libzypp
+ callbacks (#251726)
+- 2.15.13
+
+-------------------------------------------------------------------
Old:
----
yast2-pkg-bindings-2.15.12.tar.bz2
New:
----
yast2-pkg-bindings-2.15.13.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-pkg-bindings.spec ++++++
--- /var/tmp/diff_new_pack.i22493/_old 2007-04-03 20:40:31.000000000 +0200
+++ /var/tmp/diff_new_pack.i22493/_new 2007-04-03 20:40:31.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-pkg-bindings (Version 2.15.12)
+# spec file for package yast2-pkg-bindings (Version 2.15.13)
#
# 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-pkg-bindings
-Version: 2.15.12
+Version: 2.15.13
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-pkg-bindings-2.15.12.tar.bz2
+Source0: yast2-pkg-bindings-2.15.13.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.14.3
@@ -40,7 +40,7 @@
Stanislav Visnovsky
%prep
-%setup -n yast2-pkg-bindings-2.15.12
+%setup -n yast2-pkg-bindings-2.15.13
%build
%{prefix}/bin/y2tool y2autoconf
@@ -71,6 +71,11 @@
%doc %{prefix}/share/doc/packages/yast2-pkg-bindings
%changelog
+* Mon Apr 02 2007 - lslezak@suse.cz
+- new callbacks Pkg::CallbackSourceCreateInit/Destroy() and
+ Pkg::CallbackSourceReportInit() - handle the ctor/dtor of libzypp
+ callbacks (#251726)
+- 2.15.13
* Wed Feb 21 2007 - lslezak@suse.cz
- display redirected URL instead of the original URL in the media
change popup (#157040)
++++++ yast2-pkg-bindings-2.15.12.tar.bz2 -> yast2-pkg-bindings-2.15.13.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.15.12/configure new/yast2-pkg-bindings-2.15.13/configure
--- old/yast2-pkg-bindings-2.15.12/configure 2007-02-21 17:55:48.000000000 +0100
+++ new/yast2-pkg-bindings-2.15.13/configure 2007-04-02 14:16:47.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.15.12.
+# Generated by GNU Autoconf 2.60 for yast2-pkg-bindings 2.15.13.
#
# 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.15.12'
-PACKAGE_STRING='yast2-pkg-bindings 2.15.12'
+PACKAGE_VERSION='2.15.13'
+PACKAGE_STRING='yast2-pkg-bindings 2.15.13'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1429,7 +1429,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.15.12 to adapt to many kinds of systems.
+\`configure' configures yast2-pkg-bindings 2.15.13 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1500,7 +1500,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-pkg-bindings 2.15.12:";;
+ short | recursive ) echo "Configuration of yast2-pkg-bindings 2.15.13:";;
esac
cat <<\_ACEOF
@@ -1608,7 +1608,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-pkg-bindings configure 2.15.12
+yast2-pkg-bindings configure 2.15.13
generated by GNU Autoconf 2.60
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1622,7 +1622,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.15.12, which was
+It was created by yast2-pkg-bindings $as_me 2.15.13, which was
generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -2423,7 +2423,7 @@
# Define the identity of the package.
PACKAGE='yast2-pkg-bindings'
- VERSION='2.15.12'
+ VERSION='2.15.13'
cat >>confdefs.h <<_ACEOF
@@ -2650,7 +2650,7 @@
-VERSION="2.15.12"
+VERSION="2.15.13"
RPMNAME="yast2-pkg-bindings"
MAINTAINER="Ladislav Slezák "
@@ -21612,7 +21612,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.15.12, which was
+This file was extended by yast2-pkg-bindings $as_me 2.15.13, which was
generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21665,7 +21665,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-pkg-bindings config.status 2.15.12
+yast2-pkg-bindings config.status 2.15.13
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.15.12/configure.in new/yast2-pkg-bindings-2.15.13/configure.in
--- old/yast2-pkg-bindings-2.15.12/configure.in 2007-02-21 17:55:36.000000000 +0100
+++ new/yast2-pkg-bindings-2.15.13/configure.in 2007-04-02 14:16:31.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-pkg-bindings, 2.15.12, http://bugs.opensuse.org/, yast2-pkg-bindings)
+AC_INIT(yast2-pkg-bindings, 2.15.13, 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.15.12"
+VERSION="2.15.13"
RPMNAME="yast2-pkg-bindings"
MAINTAINER="Ladislav Slezák "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.15.12/src/Callbacks.cc new/yast2-pkg-bindings-2.15.13/src/Callbacks.cc
--- old/yast2-pkg-bindings-2.15.12/src/Callbacks.cc 2007-02-21 10:51:55.000000000 +0100
+++ new/yast2-pkg-bindings-2.15.13/src/Callbacks.cc 2007-03-29 15:24:22.000000000 +0200
@@ -87,10 +87,12 @@
virtual void reportbegin()
{
+ y2milestone("Convert DB Init Callback");
}
virtual void reportend()
{
+ y2milestone("Convert DB Destroy Callback");
}
virtual void start(zypp::Pathname pname) {
@@ -972,6 +974,28 @@
{
SourceCreateReceive( RecipientCtl & construct_r ) : Recipient( construct_r ) {}
+ virtual void reportbegin()
+ {
+ CB callback( ycpcb( YCPCallbacks::CB_SourceCreateInit ) );
+ y2debug("Source Create begin");
+
+ if (callback._set)
+ {
+ callback.evaluate();
+ }
+ }
+
+ virtual void reportend()
+ {
+ CB callback( ycpcb( YCPCallbacks::CB_SourceCreateDestroy ) );
+ y2debug("Source Create destroy");
+
+ if (callback._set)
+ {
+ callback.evaluate();
+ }
+ }
+
virtual void start( const zypp::Url &url )
{
CB callback( ycpcb( YCPCallbacks::CB_SourceCreateStart ) );
@@ -1191,6 +1215,28 @@
struct SourceReport : public Recipient, public zypp::callback::ReceiveReportzypp::source::SourceReport
{
+ virtual void reportbegin()
+ {
+ CB callback( ycpcb( YCPCallbacks::CB_SourceReportInit ) );
+ y2debug("Source Report begin");
+
+ if (callback._set)
+ {
+ callback.evaluate();
+ }
+ }
+
+ virtual void reportend()
+ {
+ CB callback( ycpcb( YCPCallbacks::CB_SourceReportDestroy ) );
+ y2debug("Source Report end");
+
+ if (callback._set)
+ {
+ callback.evaluate();
+ }
+ }
+
SourceReport( RecipientCtl & construct_r ) : Recipient( construct_r ) {}
virtual void start( zypp::Source_Ref source, const std::string &task )
@@ -2144,6 +2190,25 @@
}
+YCPValue PkgModuleFunctions::CallbackSourceReportInit( const YCPString& func)
+{
+ return SET_YCP_CB( CB_SourceReportInit, func );
+}
+
+YCPValue PkgModuleFunctions::CallbackSourceReportDestroy( const YCPString& func)
+{
+ return SET_YCP_CB( CB_SourceReportDestroy, func );
+}
+
+YCPValue PkgModuleFunctions::CallbackSourceCreateInit( const YCPString& func)
+{
+ return SET_YCP_CB( CB_SourceCreateInit, func );
+}
+
+YCPValue PkgModuleFunctions::CallbackSourceCreateDestroy( const YCPString& func)
+{
+ return SET_YCP_CB( CB_SourceCreateDestroy, func );
+}
/**
* @builtin CallbackSourceProbeStart
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.15.12/src/Callbacks.YCP.h new/yast2-pkg-bindings-2.15.13/src/Callbacks.YCP.h
--- old/yast2-pkg-bindings-2.15.12/src/Callbacks.YCP.h 2007-02-14 13:59:49.000000000 +0100
+++ new/yast2-pkg-bindings-2.15.13/src/Callbacks.YCP.h 2007-03-23 15:09:55.000000000 +0100
@@ -73,6 +73,7 @@
CB_StartPackage, CB_ProgressPackage, CB_DonePackage,
CB_SourceCreateStart, CB_SourceCreateProgress, CB_SourceCreateError, CB_SourceCreateEnd,
+ CB_SourceCreateInit, CB_SourceCreateDestroy,
CB_StartSourceRefresh, CB_ErrorSourceRefresh, CB_DoneSourceRefresh, CB_ProgressSourceRefresh,
CB_StartDeltaDownload, CB_ProgressDeltaDownload, CB_ProblemDeltaDownload,
@@ -82,7 +83,7 @@
CB_StartDownload, CB_ProgressDownload, CB_DoneDownload,
CB_SourceProbeStart, CB_SourceProbeFailed, CB_SourceProbeSucceeded, CB_SourceProbeEnd, CB_SourceProbeProgress, CB_SourceProbeError,
- CB_SourceReportStart, CB_SourceReportProgress, CB_SourceReportError, CB_SourceReportEnd,
+ CB_SourceReportStart, CB_SourceReportProgress, CB_SourceReportError, CB_SourceReportEnd, CB_SourceReportInit, CB_SourceReportDestroy,
CB_ScriptStart, CB_ScriptProgress, CB_ScriptProblem, CB_ScriptFinish,
CB_Message,
@@ -142,6 +143,8 @@
ENUM_OUT( SourceCreateProgress );
ENUM_OUT( SourceCreateError );
ENUM_OUT( SourceCreateEnd );
+ ENUM_OUT( SourceCreateInit );
+ ENUM_OUT( SourceCreateDestroy );
ENUM_OUT( SourceProbeStart );
ENUM_OUT( SourceProbeFailed );
@@ -154,6 +157,8 @@
ENUM_OUT( SourceReportProgress );
ENUM_OUT( SourceReportError );
ENUM_OUT( SourceReportEnd );
+ ENUM_OUT( SourceReportInit );
+ ENUM_OUT( SourceReportDestroy );
ENUM_OUT( StartSourceRefresh );
ENUM_OUT( ErrorSourceRefresh );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.15.12/src/PkgModuleFunctions.h new/yast2-pkg-bindings-2.15.13/src/PkgModuleFunctions.h
--- old/yast2-pkg-bindings-2.15.12/src/PkgModuleFunctions.h 2007-02-15 10:29:30.000000000 +0100
+++ new/yast2-pkg-bindings-2.15.13/src/PkgModuleFunctions.h 2007-03-23 15:11:47.000000000 +0100
@@ -113,6 +113,8 @@
// callback related funcions
void CallSourceReportStart(const std::string &text);
void CallSourceReportEnd(const std::string &text);
+ void CallSourceReportInit();
+ void CallSourceReportDestroy();
// After all, APPL_HIGH might be more appropriate, because we suggest
// the user what he should do and if it does not work, it's his job to
@@ -224,6 +226,10 @@
YCPValue CallbackSourceCreateError( const YCPString& func);
/* TYPEINFO: void(string) */
YCPValue CallbackSourceCreateEnd( const YCPString& func);
+ /* TYPEINFO: void(string) */
+ YCPValue CallbackSourceCreateInit( const YCPString& func);
+ /* TYPEINFO: void(string) */
+ YCPValue CallbackSourceCreateDestroy( const YCPString& func);
/* TYPEINFO: void(string) */
YCPValue CallbackSourceProbeStart( const YCPString& func);
@@ -239,6 +245,10 @@
YCPValue CallbackSourceProbeError( const YCPString& func);
/* TYPEINFO: void(string) */
+ YCPValue CallbackSourceReportInit( const YCPString& func);
+ /* TYPEINFO: void(string) */
+ YCPValue CallbackSourceReportDestroy( const YCPString& func);
+ /* TYPEINFO: void(string) */
YCPValue CallbackSourceReportStart( const YCPString& func);
/* TYPEINFO: void(string) */
YCPValue CallbackSourceReportProgress( const YCPString& func);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.15.12/src/Source.cc new/yast2-pkg-bindings-2.15.13/src/Source.cc
--- old/yast2-pkg-bindings-2.15.12/src/Source.cc 2007-02-21 14:30:44.000000000 +0100
+++ new/yast2-pkg-bindings-2.15.13/src/Source.cc 2007-03-23 11:17:53.000000000 +0100
@@ -85,6 +85,31 @@
}
}
+void PkgModuleFunctions::CallSourceReportInit()
+{
+ // get the YCP callback handler for init event
+ Y2Function* ycp_handler = _callbackHandler._ycpCallbacks.createCallback(CallbackHandler::YCPCallbacks::CB_SourceReportInit);
+
+ // is the callback registered?
+ if (ycp_handler != NULL)
+ {
+ // evaluate the callback function
+ ycp_handler->evaluateCall();
+ }
+}
+
+void PkgModuleFunctions::CallSourceReportDestroy()
+{
+ // get the YCP callback handler for destroy event
+ Y2Function* ycp_handler = _callbackHandler._ycpCallbacks.createCallback(CallbackHandler::YCPCallbacks::CB_SourceReportDestroy);
+
+ // is the callback registered?
+ if (ycp_handler != NULL)
+ {
+ // evaluate the callback function
+ ycp_handler->evaluateCall();
+ }
+}
/**
* Logging helper:
* call zypp::SourceManager::sourceManager()->findSource
@@ -135,6 +160,7 @@
YCPValue
PkgModuleFunctions::SourceRestore()
{
+ CallSourceReportInit();
CallSourceReportStart(_("Downloading files..."));
bool success = true;
@@ -170,6 +196,7 @@
}
CallSourceReportEnd(_("Downloading files..."));
+ CallSourceReportDestroy();
return YCPBoolean(success);
}
@@ -188,6 +215,7 @@
{
bool success = true;
+ CallSourceReportInit();
CallSourceReportStart(_("Parsing files..."));
std::listzypp::SourceManager::SourceId ids;
@@ -248,6 +276,7 @@
}
CallSourceReportEnd(_("Parsing files..."));
+ CallSourceReportDestroy();
return YCPBoolean(success);
}
@@ -689,6 +718,7 @@
YCPValue
PkgModuleFunctions::SourceProvideFile (const YCPInteger& id, const YCPInteger& mid, const YCPString& f)
{
+ CallSourceReportInit();
CallSourceReportStart(_("Downloading file..."));
zypp::Source_Ref src;
@@ -718,6 +748,7 @@
}
CallSourceReportEnd(_("Downloading file..."));
+ CallSourceReportDestroy();
if (found)
{
@@ -747,6 +778,7 @@
YCPValue
PkgModuleFunctions::SourceProvideOptionalFile (const YCPInteger& id, const YCPInteger& mid, const YCPString& f)
{
+ CallSourceReportInit();
CallSourceReportStart(_("Downloading files..."));
YCPValue ret;
@@ -790,6 +822,7 @@
CallSourceReportEnd(_("Downloading files..."));
+ CallSourceReportDestroy();
if (found)
{
@@ -1265,9 +1298,11 @@
src.enable();
+ CallSourceReportInit();
CallSourceReportStart(_("Parsing files..."));
zypp_ptr()->addResolvables (src.resolvables());
CallSourceReportEnd(_("Parsing files..."));
+ CallSourceReportDestroy();
// return the id of the first product
if ( ret == -1 )
@@ -1292,9 +1327,11 @@
src.enable();
+ CallSourceReportInit();
CallSourceReportStart(_("Parsing files..."));
zypp_ptr()->addResolvables (src.resolvables());
CallSourceReportEnd(_("Parsing files..."));
+ CallSourceReportDestroy();
}
catch ( const zypp::Exception& excpt)
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.15.12/VERSION new/yast2-pkg-bindings-2.15.13/VERSION
--- old/yast2-pkg-bindings-2.15.12/VERSION 2007-02-21 17:49:01.000000000 +0100
+++ new/yast2-pkg-bindings-2.15.13/VERSION 2007-04-02 13:58:34.000000000 +0200
@@ -1 +1 @@
-2.15.12
+2.15.13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org