diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2008-11-19 09:45:05 +0200 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2008-11-19 09:45:05 +0200 |
| commit | 30fb610125d57bfdeab38a1811bf563bf264180e (patch) | |
| tree | 143114b8e93441970cf2c9f5300daaed5197409f | |
| parent | 140f0c8c8339524968e9ca595fabe9a28b38f49f (diff) | |
| download | rpm-30fb610125d57bfdeab38a1811bf563bf264180e.tar.gz rpm-30fb610125d57bfdeab38a1811bf563bf264180e.tar.bz2 rpm-30fb610125d57bfdeab38a1811bf563bf264180e.zip | |
Refer to psm->te instead of fi->te in rpmpsmStage()
- transaction element is passed to psm, might as well use it
| -rw-r--r-- | lib/psm.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -1338,21 +1338,21 @@ rpmRC rpmpsmStage(rpmpsm psm, pkgStage stage) /* XXX Synthesize callbacks for packages with no files. */ if (rpmfiFC(fi) <= 0) { void * ptr; - ptr = rpmtsNotify(ts, fi->te, RPMCALLBACK_INST_START, 0, 100); - ptr = rpmtsNotify(ts, fi->te, RPMCALLBACK_INST_PROGRESS, 100, 100); + ptr = rpmtsNotify(ts, psm->te, RPMCALLBACK_INST_START, 0, 100); + ptr = rpmtsNotify(ts, psm->te, RPMCALLBACK_INST_PROGRESS, 100, 100); break; } /* Retrieve type of payload compression. */ rc = rpmpsmNext(psm, PSM_RPMIO_FLAGS); - if (rpmteFd(fi->te) == NULL) { /* XXX can't happen */ + if (rpmteFd(psm->te) == NULL) { /* XXX can't happen */ rc = RPMRC_FAIL; break; } /* LCL: fi->fd != NULL here. */ - psm->cfd = Fdopen(fdDup(Fileno(rpmteFd(fi->te))), psm->rpmio_flags); + psm->cfd = Fdopen(fdDup(Fileno(rpmteFd(psm->te))), psm->rpmio_flags); if (psm->cfd == NULL) { /* XXX can't happen */ rc = RPMRC_FAIL; break; @@ -1406,8 +1406,8 @@ rpmRC rpmpsmStage(rpmpsm psm, pkgStage stage) /* XXX Synthesize callbacks for packages with no files. */ if (rpmfiFC(fi) <= 0) { void * ptr; - ptr = rpmtsNotify(ts, fi->te, RPMCALLBACK_UNINST_START, 0, 100); - ptr = rpmtsNotify(ts, fi->te, RPMCALLBACK_UNINST_STOP, 0, 100); + ptr = rpmtsNotify(ts, psm->te, RPMCALLBACK_UNINST_START, 0, 100); + ptr = rpmtsNotify(ts, psm->te, RPMCALLBACK_UNINST_STOP, 0, 100); break; } |