darktemplar/apt
1
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

rpmpm.c: fixed rpmdepCheck() call

Browse Source 
It is not clear what rpmdepCheck() return code is supposed to mean.
Logically, non-zero return code should mean that the dependency check
failed.  However, rpm can also return 0 (for "no error") while setting
"conflicts" pointer.  So, for now, it seems that we should check both
the return code and the pointer.
This commit is contained in:
Alexey Tourbin 2010-08-18 16:16:11 +04:00
parent cfd2cddf4a
commit ccee73bb59
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apt/apt-pkg/rpm/rpmpm.cc
View File

@ -852,14 +852,14 @@ bool pkgRPMLibPM::Process(vector<const char*> &install,
}
}
#else
#if RPM_VERSION < 0x040000
rpmDependencyConflict *conflicts;
#else
rpmDependencyConflict conflicts;
#endif
if (_config->FindB("RPM::NoDeps", false) == false) {
#if RPM_VERSION < 0x040000
rpmDependencyConflict *conflicts = NULL;
#else
rpmDependencyConflict conflicts = NULL;
#endif
int numConflicts;
if (rpmdepCheck(TS, &conflicts, &numConflicts)) {
if (rpmdepCheck(TS, &conflicts, &numConflicts) || conflicts) {
_error->Error(_("Transaction set check failed"));
if (conflicts) {
printDepProblems(stderr, conflicts, numConflicts);