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

Simplify rpmcliTransaction() a bit 

- No need for separate the install and erase cases here for problem
  filter flags: we only check disk space for added packages so this
  is just a no-op anyway
- Also no need to fiddle with eflags for ordering, we always want
  ordering unless --noorder specified
This commit is contained in:
Panu Matilainen 2010-03-26 16:14:52 +02:00
parent 42fa7b7d4f
commit 98cfe65207
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/rpminstall.c
View File

@ -259,7 +259,7 @@ static int rpmcliTransaction(rpmts ts, struct rpmInstallArguments_s * ia,
ps = rpmpsFree(ps);
}
if ((eflags? 1 : (!stop)) && !(ia->installInterfaceFlags & INSTALL_NOORDER)) {
if (!stop && !(ia->installInterfaceFlags & INSTALL_NOORDER)) {
if (rpmtsOrder(ts)) {
rc = numPackages;
stop = 1;
@ -267,16 +267,10 @@ static int rpmcliTransaction(rpmts ts, struct rpmInstallArguments_s * ia,
}
if (numPackages && !stop) {
if (eflags) {
rpmlog(RPMLOG_DEBUG, "erasing packages\n");
rpmtsClean(ts);
rc = rpmtsRun(ts, NULL, ia->probFilter & (RPMPROB_FILTER_DISKSPACE|RPMPROB_FILTER_DISKNODES));
} else {
rpmlog(RPMLOG_DEBUG, "installing binary packages\n");
rpmtsClean(ts);
rc = rpmtsRun(ts, NULL, ia->probFilter);
}
rpmlog(RPMLOG_DEBUG, eflags ? "erasing packages\n" :
"installing binary packages\n");
rpmtsClean(ts);
rc = rpmtsRun(ts, NULL, ia->probFilter);
ps = rpmtsProblems(ts);