diff options
| author | Michael Schroeder <mls@suse.de> | 2014-07-08 14:11:18 +0200 |
|---|---|---|
| committer | Michael Schroeder <mls@suse.de> | 2014-07-08 14:11:18 +0200 |
| commit | ecb3129a01adbfed28aac3ddf5883737353058f4 (patch) | |
| tree | efb260603b066664818c7c813a5364d1ee953322 | |
| parent | c50b68298dd430a3cdf58a0c252a890fcdc23dd2 (diff) | |
| download | libsolv-ecb3129a01adbfed28aac3ddf5883737353058f4.tar.gz libsolv-ecb3129a01adbfed28aac3ddf5883737353058f4.tar.bz2 libsolv-ecb3129a01adbfed28aac3ddf5883737353058f4.zip | |
tweak solver_identical so that applications ignore requires
Fixes bug 885830.
| -rw-r--r-- | src/solvable.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/solvable.c b/src/solvable.c index 815e9f0..cccc89d 100644 --- a/src/solvable.c +++ b/src/solvable.c @@ -779,9 +779,13 @@ solvable_identical(Solvable *s1, Solvable *s2) } 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) |