Move temporary install suffix creation to more logical place
authorPanu Matilainen <pmatilai@redhat.com>
Tue, 17 Apr 2012 13:01:52 +0000 (16:01 +0300)
committerPanu Matilainen <pmatilai@redhat.com>
Tue, 17 Apr 2012 13:01:52 +0000 (16:01 +0300)
- Only installation needs, so move it to rpmPackageFilesInstall()

lib/fsm.c

index b1c0e7a..2dcbf41 100644 (file)
--- a/lib/fsm.c
+++ b/lib/fsm.c
@@ -654,10 +654,6 @@ static int fsmSetup(FSM_t fsm, fileStage goal,
     if (fsm->failedFile)
        *fsm->failedFile = NULL;
 
-    if (fsm->goal == FSM_PKGINSTALL) {
-       rasprintf(&fsm->suffix, ";%08x", (unsigned)rpmtsGetTid(ts));
-    }
-
     ec = fsm->rc = 0;
     rc = fsmCreate(fsm);
     if (rc && !ec) ec = rc;
@@ -1790,6 +1786,9 @@ int rpmPackageFilesInstall(rpmts ts, rpmte te, rpmfi fi, FD_t cfd,
     memset(fsm, 0, sizeof(*fsm));
     rc = fsmSetup(fsm, FSM_PKGINSTALL, ts, te, fi, cfd, psm, NULL, failedFile);
 
+    /* transaction id used for temporary path suffix while installing */
+    rasprintf(&fsm->suffix, ";%08x", (unsigned)rpmtsGetTid(ts));
+
     /* Detect and create directories not explicitly in package. */
     if (!rc) {
        DNLI_t dnli = dnlInitIterator(fsm, 0);