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

Fix int/enum mismatches from rpmChrootIn() returns in psm 

No functional changes in here either.
This commit is contained in:
Panu Matilainen 2024-03-18 12:14:31 +02:00
parent d1ecb66a11
commit f5dd51792e
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/psm.c
View File

@ -862,7 +862,8 @@ static rpmRC rpmPackageInstall(rpmts ts, rpmpsm psm)
if (rc) break;
}
if ((rc = rpmChrootIn()) == 0) {
rc = rpmChrootIn() ? RPMRC_FAIL : RPMRC_OK;
if (rc == RPMRC_OK) {
rc = rpmpsmUnpack(psm);
rpmChrootOut();
}
@ -974,7 +975,8 @@ static rpmRC rpmPackageErase(rpmts ts, rpmpsm psm)
if (rc) break;
}
if ((rc = rpmChrootIn()) == 0) {
rc = rpmChrootIn() ? RPMRC_FAIL : RPMRC_OK;
if (rc == RPMRC_OK) {
rc = rpmpsmRemove(psm);
rpmChrootOut();
}
@ -1021,7 +1023,8 @@ static rpmRC rpmPackageRestore(rpmts ts, rpmpsm psm)
rpmRC rc = RPMRC_OK;
rpmswEnter(rpmtsOp(psm->ts, RPMTS_OP_INSTALL), 0);
if ((rc = rpmChrootIn()) == 0) {
rc = rpmChrootIn() ? RPMRC_FAIL : RPMRC_OK;
if (rc == RPMRC_OK) {
char *failedFile = NULL;
rpmpsmNotify(psm, RPMCALLBACK_INST_START, 0);
/* make sure first progress call gets made */