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

merge suckage.

This commit is contained in:
Ralf Corsépius 2007-10-30 15:52:52 +01:00
parent a100133e56 3f5d1e332e
commit 1aca65c9a7
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/rpmgi.c
View File

@ -603,7 +603,7 @@ enditer:
}
ps = rpmpsFree(ps);
ts->probs = rpmpsFree(ts->probs); /* XXX hackery */
rpmtsCleanProblems(ts);
xx = rpmtsOrder(ts);

9
lib/rpmts.c
View File

@ -848,6 +848,13 @@ rpmps rpmtsProblems(rpmts ts)
return ps;
}
void rpmtsCleanProblems(rpmts ts)
{
if (ts && ts->probs) {
ts->probs = rpmpsFree(ts->probs);
}
}
void rpmtsCleanDig(rpmts ts)
{
ts->sig = headerFreeData(ts->sig, ts->sigtype);
@ -873,7 +880,7 @@ void rpmtsClean(rpmts ts)
ts->suggests = _free(ts->suggests);
ts->nsuggests = 0;
ts->probs = rpmpsFree(ts->probs);
rpmtsCleanProblems(ts);
rpmtsCleanDig(ts);
}

6
lib/rpmts.h
View File

@ -451,6 +451,12 @@ void rpmtsSetType(rpmts ts, rpmtsType type);
*/
rpmps rpmtsProblems(rpmts ts);
/**
* Clean current transaction problem set.
* @param ts transaction set
*/
void rpmtsCleanProblems(rpmts ts);
/** \ingroup rpmts
* Free signature verification data.
* @param ts transaction set