bugfix; typos

diff --git a/zypp/solver/detail/ProblemSolutionIgnore.cc b/zypp/solver/detail/ProblemSolutionIgnore.cc
index 4d98554393b2c63cacf77dc745fd245ee169f85e..562aa98549a6dc7f791db10595a61d28ea74bb26 100644 (file)
--- a/zypp/solver/detail/ProblemSolutionIgnore.cc
+++ b/zypp/solver/detail/ProblemSolutionIgnore.cc
@@ -51,7 +51,7 @@ ProblemSolutionIgnore::ProblemSolutionIgnore( ResolverProblem_Ptr parent,
     // TranslatorExplanation %s = name of package, patch, selection ...    
     _description = str::form (_("Ignore some dependencies of %s"), item->name().c_str() );
 
-//    addAction ( new InjectSolutionAction (item, capability, REQUIRES));
+    addAction ( new InjectSolutionAction (item, WEAK));
 }      
        
 ProblemSolutionIgnore::ProblemSolutionIgnore( ResolverProblem_Ptr parent,
@@ -61,7 +61,7 @@ ProblemSolutionIgnore::ProblemSolutionIgnore( ResolverProblem_Ptr parent,
        _description = _("Generally ignore of some dependecies");
        for (PoolItemList::const_iterator iter = itemList.begin();
             iter != itemList.end(); iter++) {
-//         addAction ( new InjectSolutionAction (*iter, capability, REQUIRES));
+           addAction ( new InjectSolutionAction (*iter, WEAK));
        }
 }
        

diff --git a/zypp/solver/detail/SATResolver.cc b/zypp/solver/detail/SATResolver.cc
index 3dab468037a8b9452971b2a30657d622e547628e..c3f6fd722409c611dcca9219befdb10c6a056d27 100644 (file)
--- a/zypp/solver/detail/SATResolver.cc
+++ b/zypp/solver/detail/SATResolver.cc
@@ -960,8 +960,8 @@ SATResolver::problems ()
            MIL << "Problem " <<  pcnt++ << ":" << endl;
            MIL << "====================================" << endl;
            string detail;
-           Id ignorId;
-           string whatString = SATprobleminfoString (problem,detail,ignorId);
+           Id ignoreId;
+           string whatString = SATprobleminfoString (problem,detail,ignoreId);
            MIL << whatString << endl;
            MIL << "------------------------------------" << endl;
            ResolverProblem_Ptr resolverProblem = new ResolverProblem (whatString, detail);
@@ -1162,12 +1162,14 @@ SATResolver::problems ()
                MIL << "------------------------------------" << endl;
            }
 
-           if (ignorId > 0) {
+           if (ignoreId > 0) {
                // There is a possibility to ignore this error by setting weak dependencies
-               PoolItem item = _pool.find (sat::Solvable(ignorId));            
+               PoolItem item = _pool.find (sat::Solvable(ignoreId));           
                ProblemSolutionIgnore *problemSolution = new ProblemSolutionIgnore(resolverProblem, item);              
                resolverProblem->addSolution (problemSolution,
                                              false); // Solutions will be shown at the end
+               MIL << "Ignore some dependencies of " << item << endl;
+               MIL << "------------------------------------" << endl;          
            }       
            
            // save problem