ref: refs/heads/ma-misc
commit 110bd4902a965a0e72c5946ac6764bb26f185a2e
Author: Michael Andres
Date: Mon Sep 7 17:32:04 2009 +0200
Rephrase solver resolution to point out if a package will break. (bnc #520083)
---
package/libzypp.changes | 4 +++-
zypp/solver/detail/ProblemSolutionIgnore.cc | 10 +++++-----
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/package/libzypp.changes b/package/libzypp.changes
index c3c7576..d56a408 100644
--- a/package/libzypp.changes
+++ b/package/libzypp.changes
@@ -1,8 +1,10 @@
-------------------------------------------------------------------
-Mon Sep 7 17:11:21 CEST 2009 - ma@suse.de
+Mon Sep 7 17:31:20 CEST 2009 - ma@suse.de
- Fix resolution to force installation even if dependencies are missing.
(bnc #531564)
+- Rephrase solver resolution to point out if a package will break.
+ (bnc #520083)
-------------------------------------------------------------------
Fri Sep 4 12:19:50 CEST 2009 - ma@suse.de
diff --git a/zypp/solver/detail/ProblemSolutionIgnore.cc b/zypp/solver/detail/ProblemSolutionIgnore.cc
index a2fd728..cecdd43 100644
--- a/zypp/solver/detail/ProblemSolutionIgnore.cc
+++ b/zypp/solver/detail/ProblemSolutionIgnore.cc
@@ -48,12 +48,12 @@ ProblemSolutionIgnore::ProblemSolutionIgnore( ResolverProblem_Ptr parent,
PoolItem item )
: ProblemSolution (parent, "", "")
{
- // TranslatorExplanation %s = name of package, patch, selection ...
- _description = str::form (_("ignore some dependencies of %s"), item->name().c_str() );
+ // TranslatorExplanation %s = name of package, patch, selection ...
+ _description = str::form (_("break %s by ignoring some of its dependencies"), item->name().c_str() );
addAction ( new InjectSolutionAction (item, WEAK));
-}
-
+}
+
ProblemSolutionIgnore::ProblemSolutionIgnore( ResolverProblem_Ptr parent,
PoolItemList itemList )
: ProblemSolution (parent, "", "")
@@ -64,7 +64,7 @@ ProblemSolutionIgnore::ProblemSolutionIgnore( ResolverProblem_Ptr parent,
addAction ( new InjectSolutionAction (*iter, WEAK));
}
}
-
+
///////////////////////////////////////////////////////////////////
};// namespace detail
/////////////////////////////////////////////////////////////////////
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org
For additional commands, e-mail: zypp-commit+help@opensuse.org
