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

Dont bother retrieving ts problem set unless actually needed

This commit is contained in:
Panu Matilainen 2009-03-08 17:28:17 +02:00
parent 90582c6103
commit a526ff75f4
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/transaction.c
View File

@ -75,11 +75,9 @@ static int handleInstInstalledFile(const rpmts ts, rpmte p, rpmfi fi,
rpm_color_t tscolor = rpmtsColor(ts);
rpm_color_t prefcolor = rpmtsPrefColor(ts);
rpm_color_t oFColor, FColor;
rpmps ps;
unsigned int fx = rpmfiFX(fi);
rpmfs fs = rpmteGetFileStates(p);
ps = rpmtsProblems(ts);
int isCfgFile;
oFColor = rpmfiFColor(otherFi);
@ -110,12 +108,14 @@ static int handleInstInstalledFile(const rpmts ts, rpmte p, rpmfi fi,
if (rConflicts) {
char *altNEVR = headerGetNEVRA(otherHeader, NULL);
rpmps ps = rpmtsProblems(ts);
rpmpsAppend(ps, RPMPROB_FILE_CONFLICT,
rpmteNEVRA(p), rpmteKey(p),
rpmfiDN(fi), rpmfiBN(fi),
altNEVR,
0);
free(altNEVR);
rpmpsFree(ps);
}
/* Save file identifier to mark as state REPLACED. */
@ -136,7 +136,6 @@ static int handleInstInstalledFile(const rpmts ts, rpmte p, rpmfi fi,
}
rpmfiSetFReplacedSize(fi, rpmfiFSize(otherFi));
ps = rpmpsFree(ps);
return 0;
}