From: Florian Festi <ffesti@redhat.com>
Date: Wed, 28 Mar 2012 07:34:05 +0000 (+0200)
Subject: Prepare for killing the fsm: Move build code from PSM_PROCESS to FSM_PKGBUILD
X-Git-Tag: tznext/4.11.0.1.tizen20130304~600
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9b96ed08ccbc7350572630bf49ff49fafa435c49;p=tools%2Flibrpm-tizen.git

Prepare for killing the fsm: Move build code from PSM_PROCESS to FSM_PKGBUILD
---

diff --git a/lib/fsm.c b/lib/fsm.c
index 297ac2b..1e714d4 100644
--- a/lib/fsm.c
+++ b/lib/fsm.c
@@ -1851,8 +1851,14 @@ static int fsmStage(FSM_t fsm, fileStage stage)
 		break;
 	    }
 
-	    /* Copy file into archive. */
-	    rc = fsmNext(fsm, FSM_PROCESS);
+	    if (fsm->postpone || fsm->fflags & RPMFILE_GHOST) /* XXX Don't if %ghost file. */
+		continue;
+	    /* Hardlinks are handled later */
+	    if (!(S_ISREG(st->st_mode) && st->st_nlink > 1)) {
+                /* Copy file into archive. */
+		rc = writeFile(fsm, 1);
+	    }
+
 	    if (rc) {
 		(void) fsmNext(fsm, FSM_UNDO);
 		break;
@@ -1868,16 +1874,6 @@ static int fsmStage(FSM_t fsm, fileStage stage)
 	    break;
 	}
 
-	if (fsm->goal == FSM_PKGBUILD) {
-	    if (fsm->fflags & RPMFILE_GHOST) /* XXX Don't if %ghost file. */
-		break;
-	    /* Hardlinks are handled later */
-	    if (!(S_ISREG(st->st_mode) && st->st_nlink > 1)) {
-		rc = writeFile(fsm, 1);
-	    }
-	    break;
-	}
-
 	if (fsm->goal != FSM_PKGINSTALL)
 	    break;