* @param reportConflicts
*/
/* XXX only ts->{probs,rpmdb} modified */
-static int handleInstInstalledFile(const rpmts ts, rpmte p, rpmfi fi,
+static void handleInstInstalledFile(const rpmts ts, rpmte p, rpmfi fi,
Header otherHeader, rpmfi otherFi,
int beingRemoved)
{
int isCfgFile = ((rpmfiFFlags(otherFi) | rpmfiFFlags(fi)) & RPMFILE_CONFIG);
if (XFA_SKIPPING(rpmfsGetAction(fs, fx)))
- return 0;
+ return;
if (rpmfiCompare(otherFi, fi)) {
rpm_color_t tscolor = rpmtsColor(ts);
rpmfsSetAction(fs, fx, action);
}
rpmfiSetFReplacedSize(fi, rpmfiFSize(otherFi));
-
- return 0;
}
/**
rpmfs fs;
rpmfi otherFi=NULL;
int j;
- int xx;
unsigned int fileNum;
const char * oldDir;
}
rpmfiSetFX(fi, recs[j].fileno);
rpmfiSetFX(otherFi, fileNum);
- xx = handleInstInstalledFile(ts, p, fi, h, otherFi, beingRemoved);
+ handleInstInstalledFile(ts, p, fi, h, otherFi, beingRemoved);
break;
case TR_REMOVED:
if (!beingRemoved) {