Move the run time part of fstates from rpmfi to rpmfs. Keep fstates in rpmfi as long as it is a real tag read from the rpmdb.

1 files changed, 5 insertions, 3 deletions

diff --git a/lib/psm.c b/lib/psm.c
index b26019ea2..7f68d4b08 100644
--- a/lib/psm.c
+++ b/lib/psm.c
@@ -1401,11 +1401,13 @@ rpmRC rpmpsmStage(rpmpsm psm, pkgStage stage)
 
 	if (psm->goal == PSM_PKGINSTALL) {
 	    rpm_time_t installTime = (rpm_time_t) time(NULL);
-	    rpm_count_t fc = rpmfiFC(fi);
+	    rpmfs fs = rpmteGetFileStates(psm->te);
+	    rpm_count_t fc = rpmfsFC(fs);
+	    char * fileStates = rpmfsGetStates(fs);
 	    Header h = rpmteHeader(psm->te);
 
-	    if (fi->fstates != NULL && fc > 0) {
-		headerPutChar(h, RPMTAG_FILESTATES, fi->fstates, fc);
+	    if (fileStates != NULL && fc > 0) {
+		headerPutChar(h, RPMTAG_FILESTATES, fileStates, fc);
 	    }
 
 	    headerPutUint32(h, RPMTAG_INSTALLTIME, &installTime, 1);