projects
/
platform
/
upstream
/
libzypp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4c313a3
)
added self conflicts in the error message
author
Stefan Schubert
<schubi@suse.de>
Mon, 21 Apr 2008 16:57:43 +0000
(16:57 +0000)
committer
Stefan Schubert
<schubi@suse.de>
Mon, 21 Apr 2008 16:57:43 +0000
(16:57 +0000)
zypp/solver/detail/SATResolver.cc
patch
|
blob
|
history
diff --git
a/zypp/solver/detail/SATResolver.cc
b/zypp/solver/detail/SATResolver.cc
index c3f6fd722409c611dcca9219befdb10c6a056d27..6136c56e04f1f833e53058a9fd2007f43ab76c71 100644
(file)
--- a/
zypp/solver/detail/SATResolver.cc
+++ b/
zypp/solver/detail/SATResolver.cc
@@
-884,6
+884,10
@@
string SATResolver::SATprobleminfoString(Id problem, string &detail, Id &ignoreI
s2 = pool_id2solvable(pool, target);
ret = str::form (_("%s obsoletes %s provided by %s"), solvable2str(pool, s), dep2str(pool, dep), solvable2str(pool, s2));
break;
s2 = pool_id2solvable(pool, target);
ret = str::form (_("%s obsoletes %s provided by %s"), solvable2str(pool, s), dep2str(pool, dep), solvable2str(pool, s2));
break;
+ case SOLVER_PROBLEM_SELF_CONFLICT:
+ s = pool_id2solvable(pool, source);
+ ret = str::form (_("Solvable %s conflicts with %s provided by itself"), solvable2str(pool, s), dep2str(pool, dep));
+ break;
case SOLVER_PROBLEM_DEP_PROVIDERS_NOT_INSTALLABLE:
ignoreId = source; // for setting weak dependencies
s = pool_id2solvable(pool, source);
case SOLVER_PROBLEM_DEP_PROVIDERS_NOT_INSTALLABLE:
ignoreId = source; // for setting weak dependencies
s = pool_id2solvable(pool, source);