folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Kill FSM: Make FSM_PKGERASE a function

This commit is contained in:
Florian Festi 2012-03-29 15:47:41 +02:00
parent bd60c4285f
commit c5282fc60d
3 changed files with 88 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

148
lib/fsm.c
View File

@ -1801,71 +1801,6 @@ static int fsmStage(FSM_t fsm, fileStage stage)
switch (stage) {
case FSM_UNKNOWN:
break;
case FSM_PKGERASE:
while (1) {
/* Clean fsm, free'ing memory. */
rc = fsmInit(fsm);
/* Exit on end-of-payload. */
if (rc == CPIOERR_HDR_TRAILER) {
rc = 0;
break;
}
/* Remove erased files. */
if (!fsm->postpone && fsm->action == FA_ERASE) {
rpmte te = fsmGetTe(fsm);
if (S_ISDIR(st->st_mode)) {
rc = fsmRmdir(fsm->path);
if (!rc) break;
switch (rc) {
case CPIOERR_ENOENT: /* XXX rmdir("/") linux 2.2.x kernel hack */
case CPIOERR_ENOTEMPTY:
/* XXX make sure that build side permits %missingok on directories. */
if (fsm->fflags & RPMFILE_MISSINGOK)
break;
/* XXX common error message. */
rpmlog(
(strict_erasures ? RPMLOG_ERR : RPMLOG_DEBUG),
_("%s rmdir of %s failed: Directory not empty\n"),
rpmteTypeString(te), fsm->path);
break;
default:
rpmlog(
(strict_erasures ? RPMLOG_ERR : RPMLOG_DEBUG),
_("%s rmdir of %s failed: %s\n"),
rpmteTypeString(te), fsm->path, strerror(errno));
break;
}
} else {
rc = fsmUnlink(fsm->path, fsm->mapFlags);
if (!rc) break;
switch (rc) {
case CPIOERR_ENOENT:
if (fsm->fflags & RPMFILE_MISSINGOK)
break;
default:
rpmlog(
(strict_erasures ? RPMLOG_ERR : RPMLOG_DEBUG),
_("%s unlink of %s failed: %s\n"),
rpmteTypeString(te), fsm->path, strerror(errno));
break;
}
}
}
/* XXX Failure to remove is not (yet) cause for failure. */
if (!strict_erasures) rc = 0;
if (rc) break;
/* Notify on success. */
/* On erase we're iterating backwards, fixup for progress */
rpm_loff_t amount = (fsm->ix >= 0) ?
rpmfiFC(fsmGetFi(fsm)) - fsm->ix : 0;
rpmpsmNotify(fsm->psm, RPMCALLBACK_UNINST_PROGRESS, amount);
}
break;
case FSM_PKGBUILD:
while (1) {
@ -2159,3 +2094,86 @@ int rpmPackageFilesInstall(rpmts ts, rpmte te, rpmfi fi, FD_t cfd,
return (rc ? rc : ec);
}
int rpmPackageFilesRemove(rpmts ts, rpmte te, rpmfi fi,
rpmpsm psm, char ** failedFile)
{
struct fsm_s fsm_;
FSM_t fsm = &fsm_;
int rc = 0;
int ec = 0;
memset(fsm, 0, sizeof(*fsm));
rc = fsmSetup(fsm, FSM_PKGERASE, ts, te, fi, NULL, psm, NULL, failedFile);
while (!rc) {
/* Clean fsm, free'ing memory. */
rc = fsmInit(fsm);
/* Exit on end-of-payload. */
if (rc == CPIOERR_HDR_TRAILER) {
rc = 0;
break;
}
/* Remove erased files. */
if (!fsm->postpone && fsm->action == FA_ERASE) {
rpmte te = fsmGetTe(fsm);
if (S_ISDIR(fsm->sb.st_mode)) {
rc = fsmRmdir(fsm->path);
if (!rc) break;
switch (rc) {
case CPIOERR_ENOENT: /* XXX rmdir("/") linux 2.2.x kernel hack */
case CPIOERR_ENOTEMPTY:
/* XXX make sure that build side permits %missingok on directories. */
if (fsm->fflags & RPMFILE_MISSINGOK)
break;
/* XXX common error message. */
rpmlog(
(strict_erasures ? RPMLOG_ERR : RPMLOG_DEBUG),
_("%s rmdir of %s failed: Directory not empty\n"),
rpmteTypeString(te), fsm->path);
break;
default:
rpmlog(
(strict_erasures ? RPMLOG_ERR : RPMLOG_DEBUG),
_("%s rmdir of %s failed: %s\n"),
rpmteTypeString(te), fsm->path, strerror(errno));
break;
}
} else {
rc = fsmUnlink(fsm->path, fsm->mapFlags);
if (!rc) break;
switch (rc) {
case CPIOERR_ENOENT:
if (fsm->fflags & RPMFILE_MISSINGOK)
break;
default:
rpmlog(
(strict_erasures ? RPMLOG_ERR : RPMLOG_DEBUG),
_("%s unlink of %s failed: %s\n"),
rpmteTypeString(te), fsm->path, strerror(errno));
break;
}
}
}
/* XXX Failure to remove is not (yet) cause for failure. */
if (!strict_erasures) rc = 0;
if (rc) break;
/* Notify on success. */
/* On erase we're iterating backwards, fixup for progress */
rpm_loff_t amount = (fsm->ix >= 0) ?
rpmfiFC(fsmGetFi(fsm)) - fsm->ix : 0;
rpmpsmNotify(fsm->psm, RPMCALLBACK_UNINST_PROGRESS, amount);
}
ec = fsmTeardown(fsm);
/* Return the relevant code: if setup failed, teardown doesn't matter */
return (rc ? rc : ec);
}

3
lib/fsm.h
View File

@ -122,6 +122,9 @@ int rpmfsmRun(fileStage goal, rpmts ts, rpmte te, rpmfi fi, FD_t cfd,
int rpmPackageFilesInstall(rpmts ts, rpmte te, rpmfi fi, FD_t cfd,
rpmpsm psm, char ** failedFile);
int rpmPackageFilesRemove(rpmts ts, rpmte te, rpmfi fi,
rpmpsm psm, char ** failedFile);
RPM_GNUC_INTERNAL
void rpmpsmNotify(rpmpsm psm, int what, rpm_loff_t amount);
#ifdef __cplusplus

4
lib/psm.c
View File

@ -853,8 +853,8 @@ static rpmRC rpmpsmStage(rpmpsm psm, pkgStage stage)
/* XXX should't we log errors from here? */
if (rpmfiFC(fi) > 0 && !(rpmtsFlags(ts) & RPMTRANS_FLAG_JUSTDB)) {
rc = rpmfsmRun(FSM_PKGERASE, psm->ts, psm->te, psm->fi,
NULL, psm, NULL, &psm->failedFile);
rc = rpmPackageFilesRemove(psm->ts, psm->te, psm->fi,
psm, &psm->failedFile);
}
/* XXX make sure progress reaches 100% */