From 26bb41e1cb7f7836302b3555cff8f20f9fc19188 Mon Sep 17 00:00:00 2001 From: licunlong1 Date: Thu, 21 Oct 2021 21:29:25 +0800 Subject: [PATCH] don not skip abnormal files This reverts 2d52726bd55f008ea23262c2a3a31ae689cd2af4, as when removing the same file of different archs, if the file state is WRONGCOLOR, it sets the action to `skip`. This will result in some elf files left over. --- lib/transaction.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/transaction.c b/lib/transaction.c index 55bc2d9..20cf680 100644 --- a/lib/transaction.c +++ b/lib/transaction.c @@ -689,10 +689,8 @@ assert(otherFi != NULL); } if (XFA_SKIPPING(rpmfsGetAction(fs, i))) break; - if (rpmfilesFState(fi, i) != RPMFILE_STATE_NORMAL) { - rpmfsSetAction(fs, i, FA_SKIP); + if (rpmfilesFState(fi, i) != RPMFILE_STATE_NORMAL) break; - } /* Pre-existing modified config files need to be saved. */ if (rpmfilesConfigConflict(fi, i)) { -- 1.8.3.1