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

Initialize on declaration, cosmetics only...

This commit is contained in:
Panu Matilainen 2009-03-08 17:38:49 +02:00
parent 37f85b81bb
commit 1c1faec7a3
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/transaction.c
View File

@ -74,9 +74,7 @@ static int handleInstInstalledFile(const rpmts ts, rpmte p, rpmfi fi,
{ {
unsigned int fx = rpmfiFX(fi); unsigned int fx = rpmfiFX(fi);
rpmfs fs = rpmteGetFileStates(p); rpmfs fs = rpmteGetFileStates(p);
int isCfgFile; int isCfgFile = ((rpmfiFFlags(otherFi) | rpmfiFFlags(fi)) & RPMFILE_CONFIG);
isCfgFile = ((rpmfiFFlags(otherFi) | rpmfiFFlags(fi)) & RPMFILE_CONFIG);
if (XFA_SKIPPING(rpmfsGetAction(fs, fx))) if (XFA_SKIPPING(rpmfsGetAction(fs, fx)))
return 0; return 0;
@ -123,8 +121,7 @@ static int handleInstInstalledFile(const rpmts ts, rpmte p, rpmfi fi,
/* Determine config file dispostion, skipping missing files (if any). */ /* Determine config file dispostion, skipping missing files (if any). */
if (isCfgFile) { if (isCfgFile) {
int skipMissing = int skipMissing = ((rpmtsFlags(ts) & RPMTRANS_FLAG_ALLFILES) ? 0 : 1);
((rpmtsFlags(ts) & RPMTRANS_FLAG_ALLFILES) ? 0 : 1);
rpmFileAction action = rpmfiDecideFate(otherFi, fi, skipMissing); rpmFileAction action = rpmfiDecideFate(otherFi, fi, skipMissing);
rpmfsSetAction(fs, fx, action); rpmfsSetAction(fs, fx, action);
} }