Mailinglist Archive: yast-commit (2114 mails)

< Previous Next >
[yast-commit] r58680 - in /trunk/pkg-bindings: VERSION package/yast2-pkg-bindings.changes src/Callbacks.cc
  • From: mlandres@xxxxxxxxxxxxxxxx
  • Date: Fri, 18 Sep 2009 15:55:42 -0000
  • Message-id: <E1MofoE-0008V5-Bg@xxxxxxxxxxxxxxxx>
Author: mlandres
Date: Fri Sep 18 17:55:38 2009
New Revision: 58680

URL: http://svn.opensuse.org/viewcvs/yast?rev=58680&view=rev
Log:
Remove connection to dead zypp::ScanDBReport.

Modified:
trunk/pkg-bindings/VERSION
trunk/pkg-bindings/package/yast2-pkg-bindings.changes
trunk/pkg-bindings/src/Callbacks.cc

Modified: trunk/pkg-bindings/VERSION
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/VERSION?rev=58680&r1=58679&r2=58680&view=diff
==============================================================================
--- trunk/pkg-bindings/VERSION (original)
+++ trunk/pkg-bindings/VERSION Fri Sep 18 17:55:38 2009
@@ -1 +1 @@
-2.18.9
+2.18.10

Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/package/yast2-pkg-bindings.changes?rev=58680&r1=58679&r2=58680&view=diff
==============================================================================
--- trunk/pkg-bindings/package/yast2-pkg-bindings.changes (original)
+++ trunk/pkg-bindings/package/yast2-pkg-bindings.changes Fri Sep 18 17:55:38
2009
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Fri Sep 18 17:51:45 CEST 2009 - ma@xxxxxxx
+
+- Remove connection to dead zypp::ScanDBReport.
+- 2.18.10
+
+-------------------------------------------------------------------
Sun Jul 19 10:08:53 CEST 2009 - coolo@xxxxxxxxxx

- revert file list changes that slipped in while adding licenses

Modified: trunk/pkg-bindings/src/Callbacks.cc
URL:
http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Callbacks.cc?rev=58680&r1=58679&r2=58680&view=diff
==============================================================================
--- trunk/pkg-bindings/src/Callbacks.cc (original)
+++ trunk/pkg-bindings/src/Callbacks.cc Fri Sep 18 17:55:38 2009
@@ -189,66 +189,6 @@
}
};

- struct ScanDbReceive : public Recipient, public
zypp::callback::ReceiveReport<zypp::target::rpm::ScanDBReport>
- {
- ScanDbReceive( RecipientCtl & construct_r ) : Recipient( construct_r )
{}
-
- virtual void start()
- {
- CB callback( ycpcb( YCPCallbacks::CB_StartScanDb ) );
- if ( callback._set ) {
- callback.evaluate();
- }
- }
-
- virtual bool progress(int value)
- {
- CB callback( ycpcb( YCPCallbacks::CB_ProgressScanDb ) );
- if ( callback._set ) {
- // report changed values
- callback.addInt( value );
- return callback.evaluateBool();
- }
-
- // return default value from the parent class
- return zypp::target::rpm::ScanDBReport::progress(value);
- }
-
- virtual Action problem(zypp::target::rpm::ScanDBReport::Error error,
const std::string &description)
- {
- CB callback( ycpcb( YCPCallbacks::CB_ErrorScanDb ) );
- if ( callback._set ) {
- callback.addInt( error );
- callback.addStr( description );
-
- std::string ret = callback.evaluateStr();
-
- // "C" = cancel (abort)
- if (ret == "C") return zypp::target::rpm::ScanDBReport::ABORT;
-
- // "R" = retry
- if (ret == "R") return zypp::target::rpm::ScanDBReport::RETRY;
-
- // "I" = ignore
- if (ret == "I") return zypp::target::rpm::ScanDBReport::IGNORE;
-
- y2warning("Unknown callback result '%s', using default value",
ret.c_str());
- }
-
- return zypp::target::rpm::ScanDBReport::problem(error, description);
- }
-
- virtual void finish(zypp::target::rpm::ScanDBReport::Error error,
const std::string &reason)
- {
- CB callback( ycpcb( YCPCallbacks::CB_DoneScanDb ) );
- if ( callback._set ) {
- callback.addInt( error );
- callback.addStr( reason );
-
- callback.evaluate();
- }
- }
- };

///////////////////////////////////////////////////////////////////
// InstallPkgCallback
@@ -1831,7 +1771,6 @@
// RRM DB callbacks
ZyppRecipients::ConvertDbReceive _convertDbReceive;
ZyppRecipients::RebuildDbReceive _rebuildDbReceive;
- ZyppRecipients::ScanDbReceive _scanDbReceive;

// package callbacks
ZyppRecipients::InstallPkgReceive _installPkgReceive;
@@ -1871,7 +1810,6 @@
: RecipientCtl( ycpcb_r )
, _convertDbReceive( *this )
, _rebuildDbReceive( *this )
- , _scanDbReceive( *this )
, _installPkgReceive( *this, pkg )
, _removePkgReceive( *this )
, _providePkgReceive( *this, pkg )
@@ -1891,7 +1829,6 @@
// connect the receivers
_convertDbReceive.connect();
_rebuildDbReceive.connect();
- _scanDbReceive.connect();
_installPkgReceive.connect();
_removePkgReceive.connect();
_providePkgReceive.connect();
@@ -1914,7 +1851,6 @@
// disconnect the receivers
_convertDbReceive.disconnect();
_rebuildDbReceive.disconnect();
- _scanDbReceive.disconnect();
_installPkgReceive.disconnect();
_removePkgReceive.disconnect();
_providePkgReceive.disconnect();

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread
  • No further messages