From 4f7f014537d0b4e20a63785de68dd74bdbcd2446 Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Tue, 4 Nov 2008 14:53:11 +0200 Subject: [PATCH] Stop messing around with rpmfi user+group names from psm - these are loaded and freed by rpmfiNew/Free() as necessary --- lib/psm.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/lib/psm.c b/lib/psm.c index b79ecb7..f286495 100644 --- a/lib/psm.c +++ b/lib/psm.c @@ -1315,17 +1315,6 @@ assert(psm->mi == NULL); fi->apath = filenames.data; /* Ick.. */ } - /* XXX AFAICT these are "can't happen" cases... */ - if (fi->fuser == NULL) { - struct rpmtd_s fuser; - headerGet(fi->h, RPMTAG_FILEUSERNAME, &fuser, hgflags); - fi->fuser = fuser.data; - } - if (fi->fgroup == NULL) { - struct rpmtd_s fgroup; - headerGet(fi->h, RPMTAG_FILEGROUPNAME, &fgroup, hgflags); - fi->fgroup = fgroup.data; - } rc = RPMRC_OK; } if (psm->goal == PSM_PKGERASE) { @@ -1606,8 +1595,6 @@ assert(psm->mi == NULL); } psm->failedFile = _free(psm->failedFile); - fi->fgroup = _free(fi->fgroup); - fi->fuser = _free(fi->fuser); fi->apath = _free(fi->apath); fi->fstates = _free(fi->fstates); break; -- 2.7.4