From c266f5bdd600c07924e4b2ceca45c4ce2aae3ff2 Mon Sep 17 00:00:00 2001 From: tjenssen Date: Thu, 27 Sep 2012 18:20:17 +0200 Subject: no matter which verbose mode - warnings should be shown - and creation of the exception shouldn't write the warning - this should be happen in the catch block Change-Id: I574c77fab42845079bda7c0d57c4a4a0bdbe1e7f Reviewed-by: Karsten Heimrich Reviewed-by: Tim Jenssen --- src/libs/installer/errors.h | 2 +- src/libs/installer/init.cpp | 5 +++++ tools/archivegen/archive.cpp | 4 ++-- tools/binarycreator/binarycreator.cpp | 2 +- tools/repogen/repogen.cpp | 4 ++-- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/libs/installer/errors.h b/src/libs/installer/errors.h index 09ad52b14..0be604db8 100644 --- a/src/libs/installer/errors.h +++ b/src/libs/installer/errors.h @@ -45,7 +45,7 @@ class Error : public std::runtime_error public: explicit Error(const QString &message) : std::runtime_error(message.toStdString()) - , m_message (message) { qWarning() << "Error-Exception:" << message; } + , m_message (message) { qDebug() << "Error-Exception:" << message; } virtual ~Error() throw() {} QString message() const { return m_message; } diff --git a/src/libs/installer/init.cpp b/src/libs/installer/init.cpp index ee5c03146..cb700ccee 100644 --- a/src/libs/installer/init.cpp +++ b/src/libs/installer/init.cpp @@ -84,6 +84,8 @@ #include +#include + namespace NArchive { namespace NBz2 { void registerArcBZip2(); } namespace NGz { void registerArcGZip(); } @@ -180,6 +182,9 @@ static void messageHandler(QtMsgType type, const char *msg) } verbose() << ba.constData() << std::endl; + if (!isVerbose() && type != QtDebugMsg) + std::cout << ba.constData() << std::endl << std::endl; + if (type == QtFatalMsg) { QtMsgHandler oldMsgHandler = qInstallMsgHandler(0); qt_message_output(type, msg); diff --git a/tools/archivegen/archive.cpp b/tools/archivegen/archive.cpp index 3b8db3e79..49792f7b5 100644 --- a/tools/archivegen/archive.cpp +++ b/tools/archivegen/archive.cpp @@ -67,9 +67,9 @@ int main(int argc, char *argv[]) QInstallerTools::compressPaths(sourceDirectories, app.arguments().at(1)); return EXIT_SUCCESS; } catch (const Lib7z::SevenZipException &e) { - std::cerr << e.message() << std::endl; + std::cerr << "caught 7zip exception: " << e.message() << std::endl; } catch (const QInstaller::Error &e) { - std::cerr << e.message() << std::endl; + std::cerr << "caught exception: " << e.message() << std::endl; } return EXIT_FAILURE; } diff --git a/tools/binarycreator/binarycreator.cpp b/tools/binarycreator/binarycreator.cpp index 043497ee3..d148b50b6 100644 --- a/tools/binarycreator/binarycreator.cpp +++ b/tools/binarycreator/binarycreator.cpp @@ -737,7 +737,7 @@ int main(int argc, char **argv) removeDirectory(metaDir, true); return result; } catch (const Error &e) { - std::cerr << e.message() << std::endl; + std::cerr << "caught exception: " << e.message() << std::endl; return EXIT_FAILURE; } catch (...) { std::cerr << "Unknown exception caught" << std::endl; diff --git a/tools/repogen/repogen.cpp b/tools/repogen/repogen.cpp index 4ff546e95..2180cf80e 100644 --- a/tools/repogen/repogen.cpp +++ b/tools/repogen/repogen.cpp @@ -229,9 +229,9 @@ int main(int argc, char** argv) moveDirectoryContents(metaTmp, repositoryDir); return 0; } catch (const Lib7z::SevenZipException &e) { - std::cerr << e.message() << std::endl; + std::cerr << "caught 7zip exception: " << e.message() << std::endl; } catch (const QInstaller::Error &e) { - std::cerr << e.message() << std::endl; + std::cerr << "caught exception: " << e.message() << std::endl; } return 1; } -- cgit v1.2.3