From ac89c499ab58d95fb99c49ceba8949072b38b461 Mon Sep 17 00:00:00 2001 From: peri4 Date: Wed, 10 Sep 2025 15:55:19 +0300 Subject: [PATCH 1/3] start debug --- utils/deploy_tool/main.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/utils/deploy_tool/main.cpp b/utils/deploy_tool/main.cpp index cf5a86d9..efbdfe7f 100644 --- a/utils/deploy_tool/main.cpp +++ b/utils/deploy_tool/main.cpp @@ -462,13 +462,15 @@ bool procDpkg(const PIString & l) { PIFile::FileInfo fi; fi.path = l; PIString cmd = dpkg + dpkgdir + " -S " + fi.name() + ign_err_suffix; - // PICout(true) << cmd; - PIString vs = execute(cmd).trim(); + PICout(true) << "** dpkg:" << cmd; + PIString vs = execute(cmd).trim(); if (!vs.isEmpty()) { PIStringList lines = vs.split('\n').reverse(); for (auto l: lines) { - l = l.left(l.find(":")); + auto sl = l; + l = l.left(l.find(":")); if (!l.isEmpty() && !l.endsWith("-cross")) all_deps << l; + PICout(true) << "** found \"" << l << "\" in \"" << sl << "\""; return true; } } From 220ce225f80fa14eb11a31b7282d9b118b5bfc7e Mon Sep 17 00:00:00 2001 From: peri4 Date: Wed, 10 Sep 2025 16:05:26 +0300 Subject: [PATCH 2/3] dpkg spaces not valid --- utils/deploy_tool/main.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/deploy_tool/main.cpp b/utils/deploy_tool/main.cpp index efbdfe7f..792d9efa 100644 --- a/utils/deploy_tool/main.cpp +++ b/utils/deploy_tool/main.cpp @@ -469,7 +469,7 @@ bool procDpkg(const PIString & l) { for (auto l: lines) { auto sl = l; l = l.left(l.find(":")); - if (!l.isEmpty() && !l.endsWith("-cross")) all_deps << l; + if (!l.isEmpty() && !l.endsWith("-cross") && !l.contains(' ')) all_deps << l; PICout(true) << "** found \"" << l << "\" in \"" << sl << "\""; return true; } From 2928a690b80e4eb1ddce806351436afc5e6d6d93 Mon Sep 17 00:00:00 2001 From: peri4 Date: Wed, 10 Sep 2025 16:07:19 +0300 Subject: [PATCH 3/3] remove debug --- utils/deploy_tool/main.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/deploy_tool/main.cpp b/utils/deploy_tool/main.cpp index 792d9efa..899c9a46 100644 --- a/utils/deploy_tool/main.cpp +++ b/utils/deploy_tool/main.cpp @@ -462,15 +462,15 @@ bool procDpkg(const PIString & l) { PIFile::FileInfo fi; fi.path = l; PIString cmd = dpkg + dpkgdir + " -S " + fi.name() + ign_err_suffix; - PICout(true) << "** dpkg:" << cmd; - PIString vs = execute(cmd).trim(); + // PICout(true) << "** dpkg:" << cmd; + PIString vs = execute(cmd).trim(); 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 << "\""; + // PICout(true) << "** found \"" << l << "\" in \"" << sl << "\""; return true; } }