Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pkgman resolve-dependencies: Avoid code duplication

Browse Source
This commit is contained in:
Ingo Weinhold 2013-04-03 20:11:11 +02:00
parent 4b8aabfac9
commit 046f1c4378
1 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/bin/pkgman/command_resolve_dependencies.cpp
View File

@ -221,6 +221,23 @@ private:
};
static void
check_problems(BSolver* solver, const char* errorContext)
{
if (solver->HasProblems()) {
fprintf(stderr,
"Encountered problems %s:\n", errorContext);
int32 problemCount = solver->CountProblems();
for (int32 i = 0; i < problemCount; i++) {
printf(" %" B_PRId32 ": %s\n", i + 1,
solver->ProblemAt(i)->ToString().String());
}
exit(1);
}
}
static void
verify_result(const BSolverResult& result, BSolverPackage* specifiedPackage)
{
@ -248,17 +265,7 @@ verify_result(const BSolverResult& result, BSolverPackage* specifiedPackage)
if (error != B_OK)
DIE(error, "failed to verify computed package dependencies");
if (solver->HasProblems()) {
fprintf(stderr,
"Encountered problems verifying computed package dependencies:\n");
int32 problemCount = solver->CountProblems();
for (int32 i = 0; i < problemCount; i++) {
printf(" %" B_PRId32 ": %s\n", i + 1,
solver->ProblemAt(i)->ToString().String());
}
exit(1);
}
check_problems(solver, "verifying computed package dependencies");
}
@ -349,17 +356,7 @@ command_resolve_dependencies(int argc, const char* const* argv)
if (error != B_OK)
DIE(error, "failed to resolve package dependencies");
if (solver->HasProblems()) {
fprintf(stderr,
"Encountered problems resolving package dependencies:\n");
int32 problemCount = solver->CountProblems();
for (int32 i = 0; i < problemCount; i++) {
printf(" %" B_PRId32 ": %s\n", i + 1,
solver->ProblemAt(i)->ToString().String());
}
exit(1);
}
check_problems(solver, "resolving package dependencies");
BSolverResult result;
error = solver->GetResult(result);