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

I don't know why this works better, but it does. 

CVS patchset: 2780
CVS date: 1999/02/07 18:36:13
This commit is contained in:
ewt 1999-02-07 18:36:13 +00:00
parent 05e7aecfed
commit d9ff192cba
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/transaction.c
View File

@ -872,7 +872,7 @@ static int handleRmvdInstalledFiles(struct fileInfo * fi, rpmdb db,
void handleOverlappedFiles(struct fileInfo * fi, hashTable ht,
rpmProblemSet probs) {
int i, j;
struct fileInfo ** recs, * otherRec = NULL;
struct fileInfo ** recs;
int numRecs;
int otherPkgNum, otherFileNum;
struct stat sb;
@ -898,15 +898,13 @@ void handleOverlappedFiles(struct fileInfo * fi, hashTable ht,
recs[otherPkgNum]->fps[otherFileNum]))
break;
if ((otherFileNum >= 0) &&
(recs[otherPkgNum]->actions[otherFileNum] != UNKNOWN)) {
otherRec = recs[otherPkgNum];
(recs[otherPkgNum]->actions[otherFileNum] != UNKNOWN))
break;
}
}
otherPkgNum--;
}
if (fi->type == ADDED && !otherRec) {
if (fi->type == ADDED && otherPkgNum < 0) {
/* If it isn't in the database, install it.
FIXME: check for config files here for .rpmorig purporses! */
if (fi->actions[i] == UNKNOWN) {
@ -917,22 +915,22 @@ void handleOverlappedFiles(struct fileInfo * fi, hashTable ht,
fi->actions[i] = CREATE;
}
} else if (fi->type == ADDED) {
if (filecmp(otherRec->fmodes[otherFileNum],
otherRec->fmd5s[otherFileNum],
otherRec->flinks[otherFileNum],
if (filecmp(recs[otherPkgNum]->fmodes[otherFileNum],
recs[otherPkgNum]->fmd5s[otherFileNum],
recs[otherPkgNum]->flinks[otherFileNum],
fi->fmodes[i],
fi->fmd5s[i],
fi->flinks[i])) {
psAppend(probs, RPMPROB_NEW_FILE_CONFLICT, fi->ap->key,
fi->ap->h, fi->fl[i], otherRec->ap->h);
fi->ap->h, fi->fl[i], recs[otherPkgNum]->ap->h);
}
/* FIXME: is this right??? it locks us into the config
file handling choice we already made, which may very
well be exactly right. */
fi->actions[i] = otherRec->actions[otherFileNum];
fi->actions[i] = recs[otherPkgNum]->actions[otherFileNum];
recs[otherPkgNum]->actions[otherFileNum] = SKIP;
} else if (fi->type == REMOVED && otherRec) {
} else if (fi->type == REMOVED && otherPkgNum >= 0) {
fi->actions[i] = SKIP;
} else if (fi->type == REMOVED) {
if (fi->actions[i] != SKIP && fi->actions[i] != SKIPNSTATE &&