summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authortjenssen <tim.jenssen@digia.com>2012-09-27 18:20:17 +0200
committerTim Jenssen <tim.jenssen@digia.com>2012-10-01 11:46:33 +0200
commitc266f5bdd600c07924e4b2ceca45c4ce2aae3ff2 (patch)
treea212ca411094f4730a9d8bc13040c5bcdd5e9bd9 /tools
parent51767479dedc892bc09324ec4ea83500744091d2 (diff)
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 <karsten.heimrich@digia.com> Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/archivegen/archive.cpp4
-rw-r--r--tools/binarycreator/binarycreator.cpp2
-rw-r--r--tools/repogen/repogen.cpp4
3 files changed, 5 insertions, 5 deletions
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;
}