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

Determine backup/rename based on suffix, not mode 

- This is ultimately the same thing, just eliminating unnecessary
  re-evaluation and logic duplication
This commit is contained in:
Panu Matilainen 2014-03-17 15:16:16 +02:00
parent cf7e1af291
commit c7d9ce8259
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/fsm.c
View File

@ -841,7 +841,7 @@ static int fsmCommit(FSM_t fsm, rpmfi fi, rpmFileAction action, const char *suff
const char *nsuffix = (action == FA_ALTNAME) ? SUFFIX_RPMNEW : NULL; const char *nsuffix = (action == FA_ALTNAME) ? SUFFIX_RPMNEW : NULL;
char *dest = fsm->path; char *dest = fsm->path;
/* Construct final destination path (nsuffix is usually NULL) */ /* Construct final destination path (nsuffix is usually NULL) */
if (!S_ISDIR(st->st_mode)) if (suffix)
dest = fsmFsPath(fi, nsuffix); dest = fsmFsPath(fi, nsuffix);
/* Rename temporary to final file name if needed. */ /* Rename temporary to final file name if needed. */
@ -964,7 +964,7 @@ int rpmPackageFilesInstall(rpmts ts, rpmte te, rpmfiles files, FD_t cfd,
int setmeta = 1; int setmeta = 1;
/* Directories replacing something need early backup */ /* Directories replacing something need early backup */
if (S_ISDIR(sb.st_mode)) { if (!suffix) {
rc = fsmBackup(fi, action, &fsm->exists); rc = fsmBackup(fi, action, &fsm->exists);
} }
rc = fsmVerify(fsm, fi, &sb, &osb); rc = fsmVerify(fsm, fi, &sb, &osb);
@ -1039,7 +1039,7 @@ int rpmPackageFilesInstall(rpmts ts, rpmte te, rpmfiles files, FD_t cfd,
if (!skip) { if (!skip) {
/* Backup file if needed. Directories are handled earlier */ /* Backup file if needed. Directories are handled earlier */
if (!S_ISDIR(sb.st_mode)) if (suffix)
rc = fsmBackup(fi, action, NULL); rc = fsmBackup(fi, action, NULL);
if (!rc) if (!rc)