version 5.6.1

patch deploy_tool: procDpkg now prioritize "non-cross" and "non-dev" packages, then only "non-cross"
add PIP_MANUAL_TEST CMake option
This commit is contained in:
2026-03-20 13:00:24 +03:00
parent a1be5be5a1
commit fe3b30bd49
2 changed files with 24 additions and 12 deletions

View File

@@ -467,11 +467,20 @@ bool procDpkg(const PIString & l) {
if (!vs.isEmpty()) {
PIStringList lines = vs.split('\n').reverse();
for (auto l: lines) {
auto sl = l;
l = l.left(l.find(":"));
if (!l.isEmpty() && !l.endsWith("-cross") && !l.contains(' ')) all_deps << l;
// PICout(true) << "** found \"" << l << "\" in \"" << sl << "\"";
return true;
l = l.left(l.find(":"));
if (!l.isEmpty() && !l.contains(' ') && !l.endsWith("-cross") && !l.endsWith("-dev")) {
// PICout(true) << "** found \"" << l << "\" in \"" << sl << "\"";
all_deps << l;
return true;
}
}
for (auto l: lines) {
l = l.left(l.find(":"));
if (!l.isEmpty() && !l.contains(' ') && !l.endsWith("-cross")) {
// PICout(true) << "** found \"" << l << "\" in \"" << sl << "\"";
all_deps << l;
return true;
}
}
}
// piCout << "No dep on" << l;