From a1327388bca2e8c76c07788aacf1e408758b4879 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Tue, 9 Apr 2024 14:53:50 +0200 Subject: [PATCH] execute(): Enhance debug output. --- UpdatePTUDevCtrl/utils.cpp | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/UpdatePTUDevCtrl/utils.cpp b/UpdatePTUDevCtrl/utils.cpp index cab60d3..5e82adc 100644 --- a/UpdatePTUDevCtrl/utils.cpp +++ b/UpdatePTUDevCtrl/utils.cpp @@ -277,21 +277,24 @@ bool Utils::sameFilesInDirs(QDir const &dir1, QDir const &dir2, fileNameLst2 << i2.next().fileName(); } + QString dirPath1 = dir1.absolutePath(); + QString dirPath2 = dir2.absolutePath(); + if (fileNameLst1.isEmpty()) { - qCritical() << "DIR1" << dir1.dirName() << " DOES NOT CONTAIN EXPECTED FILES"; + qCritical() << "DIR1" << dirPath1 << " DOES NOT CONTAIN EXPECTED FILES"; return false; } if (fileNameLst2.isEmpty()) { - qCritical() << "DIR1" << dir2.dirName() << " DOES NOT CONTAIN EXPECTED FILES"; + qCritical() << "DIR1" << dirPath2 << " DOES NOT CONTAIN EXPECTED FILES"; return false; } if (fileNameLst1 != fileNameLst2) { - printCriticalErrorMsg(dir1.dirName() + " AND " + dir2.dirName() + printCriticalErrorMsg(dirPath1 + " AND " + dirPath2 + " DIFFER: [" + fileNameLst1.join(',') + "],[" + fileNameLst2.join(',') + "]"); return false; } else { - printInfoMsg(dir1.dirName() + " AND " + dir2.dirName() + printInfoMsg(dirPath1 + " AND " + dirPath2 + " ARE EQUAL: [" + fileNameLst1.join(',') + "]"); } @@ -307,21 +310,21 @@ bool Utils::sameFilesInDirs(QDir const &dir1, QDir const &dir2, } if (gitBlobLst1.isEmpty()) { - qCritical() << "DIR1" << dir1.dirName() << " DOES NOT CONTAIN EXPECTED FILES"; + qCritical() << "DIR1" << dirPath1 << " DOES NOT CONTAIN EXPECTED FILES"; return false; } if (gitBlobLst2.isEmpty()) { - qCritical() << "DIR1" << dir2.dirName() << " DOES NOT CONTAIN EXPECTED FILES"; + qCritical() << "DIR1" << dirPath2 << " DOES NOT CONTAIN EXPECTED FILES"; return false; } if (gitBlobLst1 != gitBlobLst2) { - printCriticalErrorMsg(dir1.dirName() + " AND " + dir2.dirName() + printCriticalErrorMsg(dirPath1 + " AND " + dirPath2 + " DIFFER: [" + gitBlobLst1.join(',') + "],[" + gitBlobLst2.join(',') + "]"); return false; } else { - printInfoMsg(dir1.dirName() + " AND " + dir2.dirName() + printInfoMsg(dirPath1 + " AND " + dirPath2 + " CONTAIN SAME GIT-BLOBS FOR FILES: [" + fileNameLst1.join(',') + "]"); }