summaryrefslogtreecommitdiff
path: root/lib/psm.c
diff options
context:
space:
mode:
authorPanu Matilainen <pmatilai@redhat.com>2008-11-04 14:53:11 +0200
committerPanu Matilainen <pmatilai@redhat.com>2008-11-04 14:53:11 +0200
commit4f7f014537d0b4e20a63785de68dd74bdbcd2446 (patch)
tree6e15c5eb1be9231ed773fe83afa11058e13b7b34 /lib/psm.c
parente07d37aebc1ab6213507375b8916f5259cf4dc0f (diff)
downloadrpm-4f7f014537d0b4e20a63785de68dd74bdbcd2446.tar.gz
rpm-4f7f014537d0b4e20a63785de68dd74bdbcd2446.tar.bz2
rpm-4f7f014537d0b4e20a63785de68dd74bdbcd2446.zip
Stop messing around with rpmfi user+group names from psm
- these are loaded and freed by rpmfiNew/Free() as necessary
Diffstat (limited to 'lib/psm.c')
-rw-r--r--lib/psm.c13
1 files changed, 0 insertions, 13 deletions
diff --git a/lib/psm.c b/lib/psm.c
index b79ecb7e0..f2864952a 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;