From 83513ded75c50be90d9b8c4c6c879f67fa1a47bb Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Mon, 15 Jun 2009 15:21:27 +0300 Subject: [PATCH] Rip hardcoded libgcc + glibc static helper kludges - shouldn't be needed anyway anymore as package of preferred color should get always installed first, and the issue is solvable in packaging anyway --- lib/transaction.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/lib/transaction.c b/lib/transaction.c index 25a147a..f1a5290 100644 --- a/lib/transaction.c +++ b/lib/transaction.c @@ -263,12 +263,8 @@ assert(otherFi != NULL); if (tscolor != 0) { if (FColor & prefcolor) { /* ... last file of preferred colour is installed ... */ - if (!XFA_SKIPPING(rpmfsGetAction(fs, i))) { - /* XXX static helpers are order dependent. Ick. */ - if (strcmp(fn, "/usr/sbin/libgcc_post_upgrade") - && strcmp(fn, "/usr/sbin/glibc_post_upgrade")) - rpmfsSetAction(otherFs, otherFileNum, FA_SKIPCOLOR); - } + if (!XFA_SKIPPING(rpmfsGetAction(fs, i))) + rpmfsSetAction(otherFs, otherFileNum, FA_SKIPCOLOR); rpmfsSetAction(fs, i, FA_CREATE); rConflicts = 0; } else -- 2.7.4