projects
/
platform
/
upstream
/
libsolv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c50b682
)
tweak solver_identical so that applications ignore requires
author
Michael Schroeder
<mls@suse.de>
Tue, 8 Jul 2014 12:11:18 +0000
(14:11 +0200)
committer
Michael Schroeder
<mls@suse.de>
Tue, 8 Jul 2014 12:11:18 +0000
(14:11 +0200)
Fixes bug 885830.
src/solvable.c
patch
|
blob
|
history
diff --git
a/src/solvable.c
b/src/solvable.c
index
815e9f0
..
cccc89d
100644
(file)
--- a/
src/solvable.c
+++ b/
src/solvable.c
@@
-779,9
+779,13
@@
solvable_identical(Solvable *s1, Solvable *s2)
}
else
{
}
else
{
- /* workaround for bug 881493 */
- if (s1->repo && !strncmp(pool_id2str(s1->repo->pool, s1->name), "product:", 8))
- return 1;
+ if (s1->repo)
+ {
+ /* workaround for bugs 881493 and 885830*/
+ const char *n = pool_id2str(s1->repo->pool, s1->name);
+ if (!strncmp(n, "product:", 8) || !strncmp(n, "application:", 12))
+ return 1;
+ }
/* look at requires in a last attempt to find recompiled packages */
rq1 = rq2 = 0;
if (s1->requires)
/* look at requires in a last attempt to find recompiled packages */
rq1 = rq2 = 0;
if (s1->requires)