Author: mlandres
Date: Mon Jul 14 14:59:08 2008
New Revision: 49048
URL: http://svn.opensuse.org/viewcvs/yast?rev=49048&view=rev
Log:
Remove obsolete references to Script/Message/Atom
Modified:
trunk/pkg-bindings/src/Callbacks.cc
trunk/pkg-bindings/src/Package.cc
trunk/pkg-bindings/src/Resolvable_Properties.cc
Modified: trunk/pkg-bindings/src/Callbacks.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Callbacks.cc?rev=49048&r1=49047&r2=49048&view=diff
==============================================================================
--- trunk/pkg-bindings/src/Callbacks.cc (original)
+++ trunk/pkg-bindings/src/Callbacks.cc Mon Jul 14 14:59:08 2008
@@ -281,7 +281,7 @@
if (callback._set) {
callback.addStr(res->location().filename());
callback.addStr(res->summary());
- callback.addInt(res->size());
+ callback.addInt(res->installSize());
callback.addBool(false); // is_delete = false (package installation)
callback.evaluate();
}
@@ -422,7 +422,7 @@
}
};
-
+
struct ProgressReceive : public Recipient, public zypp::callback::ReceiveReportzypp::ProgressReport
{
ProgressReceive( RecipientCtl & construct_r ) : Recipient( construct_r ) {}
@@ -646,7 +646,7 @@
callback.evaluate();
}
}
-
+
// Apply delta rpm:
// - local path of downloaded delta
@@ -697,7 +697,7 @@
callback.evaluate();
}
}
-
+
// Download patch rpm:
// - path below url reported on start()
@@ -824,7 +824,7 @@
return zypp::media::DownloadProgressReport::problem(file, error, description);
}
- virtual void finish( const zypp::Url &file, zypp::media::DownloadProgressReport::Error error, const std::string &reason)
+ virtual void finish( const zypp::Url &file, zypp::media::DownloadProgressReport::Error error, const std::string &reason)
{
CB callback( ycpcb( YCPCallbacks::CB_DoneDownload ) );
@@ -866,7 +866,7 @@
callback.evaluate();
}
}
-
+
virtual bool progress( zypp::target::PatchScriptReport::Notify ping, const std::string &out = std::string() )
{
CB callback( ycpcb( YCPCallbacks::CB_ScriptProgress) );
@@ -899,7 +899,7 @@
// "A" = abort
if (ret == "A") return zypp::target::PatchScriptReport::ABORT;
- // "I" = ignore
+ // "I" = ignore
if (ret == "I") return zypp::target::PatchScriptReport::IGNORE;
// "R" = retry
@@ -1083,7 +1083,7 @@
if (!found)
{
// the source has not been redirected
- // use URL of the source
+ // use URL of the source
report_url = url;
}
@@ -1151,7 +1151,7 @@
// set the new URL
url = zypp::Url(ret);
- // remember the redirection
+ // remember the redirection
MediaMap source_redir = redirect_map[url];
source_redir[mediumNr] = url;
redirect_map[url] = source_redir;
@@ -1298,7 +1298,7 @@
virtual void start(const zypp::Url &url)
{
_silent_probing = MEDIA_CHANGE_DISABLE;
-
+
CB callback( ycpcb( YCPCallbacks::CB_SourceProbeStart ) );
if (callback._set)
@@ -1502,8 +1502,8 @@
zypp::repo::RepoReport::Error error, const std::string &description)
{
CB callback( ycpcb( YCPCallbacks::CB_SourceReportError ) );
-
- // the file is optional, ignore the error
+
+ // the file is optional, ignore the error
if (_silent_probing == ZyppRecipients::MEDIA_CHANGE_OPTIONALFILE)
{
y2milestone("The file is optional, ignoring the error");
@@ -1567,31 +1567,6 @@
}
};
-
- struct ResolvableReport : public Recipient, public zypp::callback::ReceiveReportzypp::target::MessageResolvableReport
- {
- ResolvableReport( RecipientCtl & construct_r ) : Recipient( construct_r ) {}
-
- virtual void show(zypp::Message::constPtr message)
- {
- CB callback( ycpcb( YCPCallbacks::CB_ResolvableReport) );
-
- if (callback._set)
- {
- zypp::Patch::constPtr patch = message->patch();
-
- // patch name
- callback.addStr(patch ? patch->name() : message->name());
- // patch summary
- callback.addStr(patch ? patch->summary() : message->summary());
- // message itself
- callback.addStr(message->text().asString());
-
- callback.evaluate();
- }
- }
- };
-
///////////////////////////////////////////////////////////////////
// DigestReport handler
///////////////////////////////////////////////////////////////////
@@ -1643,7 +1618,7 @@
return zypp::DigestReport::askUserToAcceptWrongDigest(file, requested, found);
}
-
+
};
@@ -1730,7 +1705,7 @@
return zypp::KeyRingReport::askUserToAcceptUnknownKey(file,id);
}
- virtual bool askUserToAcceptVerificationFailed(const std::string &file, const zypp::PublicKey &key)
+ virtual bool askUserToAcceptVerificationFailed(const std::string &file, const zypp::PublicKey &key)
{
CB callback( ycpcb( YCPCallbacks::CB_AcceptVerificationFailed) );
@@ -1823,9 +1798,6 @@
ZyppRecipients::ProgressReceive _progressReceive;
- // resolvable report
- ZyppRecipients::ResolvableReport _resolvableReport;
-
// digest callback
ZyppRecipients::DigestReceive _digestReceive;
@@ -1837,7 +1809,7 @@
// authentication callback
ZyppRecipients::AuthReceive _authReceive;
-
+
public:
ZyppReceive( const YCPCallbacks & ycpcb_r, const PkgFunctions &pkg)
@@ -1856,7 +1828,6 @@
, _sourceReport( *this, pkg)
, _probeSourceReceive( *this )
, _progressReceive( *this )
- , _resolvableReport( *this )
, _digestReceive( *this )
, _keyRingReceive( *this )
, _keyRingSignal( *this )
@@ -1877,7 +1848,6 @@
_sourceReport.connect();
_probeSourceReceive.connect();
_progressReceive.connect();
- _resolvableReport.connect();
_digestReceive.connect();
_keyRingReceive.connect();
_keyRingSignal.connect();
@@ -1901,7 +1871,6 @@
_sourceReport.disconnect();
_probeSourceReceive.disconnect();
_progressReceive.disconnect();
- _resolvableReport.disconnect();
_digestReceive.disconnect();
_keyRingReceive.disconnect();
_keyRingSignal.disconnect();
Modified: trunk/pkg-bindings/src/Package.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Package.cc?rev=49048&r1=49047&r2=49048&view=diff
==============================================================================
--- trunk/pkg-bindings/src/Package.cc (original)
+++ trunk/pkg-bindings/src/Package.cc Mon Jul 14 14:59:08 2008
@@ -265,7 +265,7 @@
// ignore disabled or delted sources
if (!(*it)->repoInfo().enabled() || (*it)->isDeleted())
continue;
-
+
source_ids.push_back(index);
}
@@ -308,7 +308,7 @@
if (medium > 0)
{
- zypp::ByteCount size = sizes ? (download_size ? pkg->downloadSize() : pkg->size()) : zypp::ByteCount(1); //count only
+ zypp::ByteCount size = sizes ? (download_size ? pkg->downloadSize() : pkg->installSize()) : zypp::ByteCount(1); //count only
// refence to the found media array
std::vectorzypp::ByteCount &ref = result[source_map[pkg->repoInfo().alias()]];
@@ -529,7 +529,7 @@
bool found = false;
std::string pkgname = package->value();
-
+
if (pkgname.empty())
{
y2warning("Pkg::%s: Package name is empty", installed ? "PkgInstalled" : "PkgAvailable");
@@ -611,7 +611,7 @@
try
{
std::string repo_alias;
-
+
if (repo_id >= 0)
{
YRepo_Ptr repo = logFindRepository(repo_id);
@@ -948,7 +948,7 @@
return YCPVoid();
}
- return YCPInteger( pkg->size() );
+ return YCPInteger( pkg->installSize() );
}
catch (...)
{
@@ -1631,7 +1631,7 @@
* on the delete_unmaintained arg, they are either tagged as to delete or
* remain unchanged.
*
- * @return map