logging ResStatus into testcase

diff --git a/zypp/solver/detail/Testcase.cc b/zypp/solver/detail/Testcase.cc
index a6a6d971e1096edfe77f4fdd9cc6e01abced8e1e..d13a21f4279d4e7c6246e795c51f2b78fd72ab56 100644 (file)
--- a/zypp/solver/detail/Testcase.cc
+++ b/zypp/solver/detail/Testcase.cc
@@ -299,19 +299,19 @@ bool Testcase::createTestcase(Resolver & resolver, bool dumpPool, bool runSolver
                          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 @@ HelixControl::~HelixControl()
          << "</test>" << endl;
 }
 
-void HelixControl::installResolvable(const ResObject::constPtr &resObject)
+void HelixControl::installResolvable(const ResObject::constPtr &resObject,
+                                    const ResStatus &status)
 {
     Repository repo  = resObject->repository();
     *file << "<install channel=\"" << numstring(repo.numericId()) << "\" kind=\"" << toLower (resObject->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 << "<lock channel=\"" << numstring(repo.numericId()) << "\" kind=\"" << toLower (resObject->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 << "<keep channel=\"" << numstring(repo.numericId()) << "\" kind=\"" << toLower (resObject->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 << "<uninstall " << " kind=\"" << toLower (resObject->kind().asString()) << "\""
-         << " name=\"" << resObject->name() << "\"" << "/>" << endl;    
+         << " name=\"" << resObject->name() << "\""
+         << " status=\"" << status << "\"" 
+         << "/>" << endl;    
 }
 
 void HelixControl::addDependencies (const CapabilitySet & capRequire, const CapabilitySet & capConflict)

diff --git a/zypp/solver/detail/Testcase.h b/zypp/solver/detail/Testcase.h
index e21e8b82d2e867bdb68e7c7679963c2679fa66a2..6fc3bd24412e7645d3ca1a277ce5b42c69034bad 100644 (file)
--- a/zypp/solver/detail/Testcase.h
+++ b/zypp/solver/detail/Testcase.h
@@ -105,10 +105,14 @@ class  HelixControl {
     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; }
 };