sinjuginas/rpm-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lib/transaction.c (handleInstInstalledFiles): fixed RPMFILE_CONFIG bug

Browse Source
This commit is contained in:
Alexey Tourbin 2008-06-04 03:20:20 +04:00
parent 4a557675fc
commit c5e957a3b3
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/transaction.c
View File

@ -942,6 +942,7 @@ static int handleInstInstalledFiles(const TFI_t fi, /*@null@*/ rpmdb db,
for (i = 0; i < sharedCount; i++, shared++) { for (i = 0; i < sharedCount; i++, shared++) {
int otherFileNum, fileNum; int otherFileNum, fileNum;
int isCfgFile;
otherFileNum = shared->otherFileNum; otherFileNum = shared->otherFileNum;
fileNum = shared->pkgFileNum; fileNum = shared->pkgFileNum;
@ -952,12 +953,13 @@ static int handleInstInstalledFiles(const TFI_t fi, /*@null@*/ rpmdb db,
if (XFA_SKIPPING(fi->actions[fileNum])) if (XFA_SKIPPING(fi->actions[fileNum]))
continue; continue;
isCfgFile = (otherFi->fflags[otherFileNum] | fi->fflags[fileNum]) & RPMFILE_CONFIG;
if (filecmp(otherFi, otherFileNum, fi, fileNum)) { if (filecmp(otherFi, otherFileNum, fi, fileNum)) {
if (reportConflicts) if (reportConflicts)
psAppend(probs, RPMPROB_FILE_CONFLICT, fi->ap, psAppend(probs, RPMPROB_FILE_CONFLICT, fi->ap,
fi->dnl[fi->dil[fileNum]], fi->bnl[fileNum], h, 0); fi->dnl[fi->dil[fileNum]], fi->bnl[fileNum], h, 0);
if (!(otherFi->fflags[otherFileNum] | fi->fflags[fileNum]) if (!isCfgFile) {
& RPMFILE_CONFIG) {
/*@-assignexpose@*/ /*@-assignexpose@*/
if (!shared->isRemoved) if (!shared->isRemoved)
fi->replaced[numReplaced++] = *shared; fi->replaced[numReplaced++] = *shared;
@ -965,7 +967,7 @@ static int handleInstInstalledFiles(const TFI_t fi, /*@null@*/ rpmdb db,
} }
} }
if ((otherFi->fflags[otherFileNum] | fi->fflags[fileNum]) & RPMFILE_CONFIG) { if (isCfgFile) {
fi->actions[fileNum] = decideFileFate( fi->actions[fileNum] = decideFileFate(
fi->dnl[fi->dil[fileNum]], fi->dnl[fi->dil[fileNum]],
fi->bnl[fileNum], fi->bnl[fileNum],