From ce7051b1905dbe50d8983d4aba43176277ae5984 Mon Sep 17 00:00:00 2001 From: Michael Andres Date: Fri, 13 Jun 2014 08:27:27 +0200 Subject: [PATCH] [hotfix] Relax solvable_identical check for producs [bnc#881493] --- src/solvable.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/solvable.c b/src/solvable.c index 8e94976..b3e73a6 100644 --- a/src/solvable.c +++ b/src/solvable.c @@ -745,19 +745,27 @@ pool_create_state_maps(Pool *pool, Queue *installed, Map *installedmap, Map *con /* Tests if two solvables have identical content. Currently * both solvables need to come from the same pool */ + +#warning HOTFIX [Bug 881493] New: zypper dup does always update sles-release +inline int isProduct(const char *name) +{ return name && strncmp(name, "product:", 8) == 0; } + int solvable_identical(Solvable *s1, Solvable *s2) { unsigned int bt1, bt2; Id rq1, rq2; Id *reqp; - if (s1->name != s2->name) return 0; if (s1->arch != s2->arch) return 0; if (s1->evr != s2->evr) return 0; + + if (isProduct(pool_id2str(s1->repo->pool, s1->name))) // HOTFIX [Bug 881493] end check for products here + return 1; + /* map missing vendor to empty string */ if ((s1->vendor ? s1->vendor : 1) != (s2->vendor ? s2->vendor : 1)) return 0; -- 2.7.4