Author: schubi2
Date: Thu Jan 24 13:35:47 2008
New Revision: 8361
URL: http://svn.opensuse.org/viewcvs/zypp?rev=8361&view=rev
Log:
logging ResStatus into testcase
Modified:
branches/tmp/ma/jump_sat/libzypp/zypp/solver/detail/Testcase.cc
branches/tmp/ma/jump_sat/libzypp/zypp/solver/detail/Testcase.h
Modified: branches/tmp/ma/jump_sat/libzypp/zypp/solver/detail/Testcase.cc
URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/solver/detail/Testcase.cc?rev=8361&r1=8360&r2=8361&view=diff
==============================================================================
--- branches/tmp/ma/jump_sat/libzypp/zypp/solver/detail/Testcase.cc (original)
+++ branches/tmp/ma/jump_sat/libzypp/zypp/solver/detail/Testcase.cc Thu Jan 24 13:35:47 2008
@@ -299,19 +299,19 @@
language);
for (PoolItemList::const_iterator iter = items_to_install.begin(); iter != items_to_install.end(); iter++) {
- control.installResolvable (iter->resolvable());
+ control.installResolvable (iter->resolvable(), iter->status());
}
for (PoolItemList::const_iterator iter = items_locked.begin(); iter != items_locked.end(); iter++) {
- control.lockResolvable (iter->resolvable());
+ control.lockResolvable (iter->resolvable(), iter->status());
}
for (PoolItemList::const_iterator iter = items_keep.begin(); iter != items_keep.end(); iter++) {
- control.keepResolvable (iter->resolvable());
+ control.keepResolvable (iter->resolvable(), iter->status());
}
for (PoolItemList::const_iterator iter = items_to_remove.begin(); iter != items_to_remove.end(); iter++) {
- control.deleteResolvable (iter->resolvable());
+ control.deleteResolvable (iter->resolvable(), iter->status());
}
control.addDependencies (resolver.extraRequires(), resolver.extraConflicts());
@@ -404,38 +404,47 @@
<< "</test>" << endl;
}
-void HelixControl::installResolvable(const ResObject::constPtr &resObject)
+void HelixControl::installResolvable(const ResObject::constPtr &resObject,
+ const ResStatus &status)
{
Repository repo = resObject->repository();
*file << "kind().asString()) << "\""
<< " name=\"" << resObject->name() << "\"" << " arch=\"" << resObject->arch().asString() << "\""
- << " version=\"" << resObject->edition().version() << "\"" << " release=\"" << resObject->edition().release() << "\""
+ << " version=\"" << resObject->edition().version() << "\"" << " release=\"" << resObject->edition().release() << "\""
+ << " status=\"" << status << "\""
<< "/>" << endl;
}
-void HelixControl::lockResolvable(const ResObject::constPtr &resObject)
+void HelixControl::lockResolvable(const ResObject::constPtr &resObject,
+ const ResStatus &status)
{
Repository repo = resObject->repository();
*file << "kind().asString()) << "\""
<< " name=\"" << resObject->name() << "\"" << " arch=\"" << resObject->arch().asString() << "\""
- << " version=\"" << resObject->edition().version() << "\"" << " release=\"" << resObject->edition().release() << "\""
+ << " version=\"" << resObject->edition().version() << "\"" << " release=\"" << resObject->edition().release() << "\""
+ << " status=\"" << status << "\""
<< "/>" << endl;
}
-void HelixControl::keepResolvable(const ResObject::constPtr &resObject)
+void HelixControl::keepResolvable(const ResObject::constPtr &resObject,
+ const ResStatus &status)
{
Repository repo = resObject->repository();
*file << "kind().asString()) << "\""
<< " name=\"" << resObject->name() << "\"" << " arch=\"" << resObject->arch().asString() << "\""
- << " version=\"" << resObject->edition().version() << "\"" << " release=\"" << resObject->edition().release() << "\""
+ << " version=\"" << resObject->edition().version() << "\"" << " release=\"" << resObject->edition().release() << "\""
+ << " status=\"" << status << "\""
<< "/>" << endl;
}
-void HelixControl::deleteResolvable(const ResObject::constPtr &resObject)
+void HelixControl::deleteResolvable(const ResObject::constPtr &resObject,
+ const ResStatus &status)
{
Repository repo = resObject->repository();
*file << "kind().asString()) << "\""
- << " name=\"" << resObject->name() << "\"" << "/>" << endl;
+ << " name=\"" << resObject->name() << "\""
+ << " status=\"" << status << "\""
+ << "/>" << endl;
}
void HelixControl::addDependencies (const CapabilitySet & capRequire, const CapabilitySet & capConflict)
Modified: branches/tmp/ma/jump_sat/libzypp/zypp/solver/detail/Testcase.h
URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/solver/detail/Testcase.h?rev=8361&r1=8360&r2=8361&view=diff
==============================================================================
--- branches/tmp/ma/jump_sat/libzypp/zypp/solver/detail/Testcase.h (original)
+++ branches/tmp/ma/jump_sat/libzypp/zypp/solver/detail/Testcase.h Thu Jan 24 13:35:47 2008
@@ -105,10 +105,14 @@
HelixControl ();
~HelixControl ();
- void installResolvable (const ResObject::constPtr &resObject);
- void lockResolvable (const ResObject::constPtr &resObject);
- void keepResolvable (const ResObject::constPtr &resObject);
- void deleteResolvable (const ResObject::constPtr &resObject);
+ void installResolvable (const ResObject::constPtr &resObject,
+ const ResStatus &status);
+ void lockResolvable (const ResObject::constPtr &resObject,
+ const ResStatus &status);
+ void keepResolvable (const ResObject::constPtr &resObject,
+ const ResStatus &status);
+ void deleteResolvable (const ResObject::constPtr &resObject,
+ const ResStatus &status);
void addDependencies (const CapabilitySet &capRequire, const CapabilitySet &capConflict);
std::string filename () { return dumpFile; }
};
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org
For additional commands, e-mail: zypp-commit+help@opensuse.org
