From b7da6759720a4d1877f5443876a24514d4ac124c Mon Sep 17 00:00:00 2001 From: Florian Festi Date: Thu, 28 Jan 2016 11:27:18 +0100 Subject: [PATCH] Revert "Fix check for file capabilities" This reverts commit 4ee56521260b6e58fb6c22b4c897f47e507ee6cd. This is no longer needed as the regular check now handles string arrays properly --- lib/rpmfi.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/lib/rpmfi.c b/lib/rpmfi.c index 08b74f90f..ea8de143d 100644 --- a/lib/rpmfi.c +++ b/lib/rpmfi.c @@ -1460,11 +1460,8 @@ static int rpmfilesPopulate(rpmfiles fi, Header h, rpmfiFlags flags) if (!(flags & RPMFI_NOFILESTATES)) _hgfi(h, RPMTAG_FILESTATES, &td, defFlags, fi->fstates); - if (!(flags & RPMFI_NOFILECAPS)) { - _hgfinc(h, RPMTAG_FILECAPS, &td, defFlags, fi->fcaps); - if (td.count && td.count != totalfc) - goto err; - } + if (!(flags & RPMFI_NOFILECAPS)) + _hgfi(h, RPMTAG_FILECAPS, &td, defFlags, fi->fcaps); if (!(flags & RPMFI_NOFILELINKTOS)) fi->flinks = tag2pool(fi->pool, h, RPMTAG_FILELINKTOS, totalfc);