From: Kern Sibbald Date: Thu, 4 Feb 2010 13:08:01 +0000 (+0100) Subject: Fix bug #1486 -- bat doesn't show any errors on command-line X-Git-Tag: Release-5.2.1~1810 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=b1ae7490422f4555c21f309f3f365725731cbfd0;p=bacula%2Fbacula Fix bug #1486 -- bat doesn't show any errors on command-line --- diff --git a/bacula/src/qt-console/console/console.cpp b/bacula/src/qt-console/console/console.cpp index f9972ddba5..8c383c8cb0 100644 --- a/bacula/src/qt-console/console/console.cpp +++ b/bacula/src/qt-console/console/console.cpp @@ -1,7 +1,7 @@ /* Bacula® - The Network Backup Solution - Copyright (C) 2007-2009 Free Software Foundation Europe e.V. + Copyright (C) 2007-2010 Free Software Foundation Europe e.V. The main author of Bacula is Kern Sibbald, with contributions from many others, a complete list can be found in the file AUTHORS. @@ -26,8 +26,6 @@ Switzerland, email:ftf@fsfeurope.org. */ /* - * Version $Id$ - * * Console Class * * Kern Sibbald, January MMVII @@ -143,7 +141,7 @@ void Console::populateLists(bool /*forcenew*/) { int conn; if (!availableDirComm(conn) && !newDirComm(conn)) { - Pmsg1(000, "newDirComm Seems to Failed to create a connection for populateLists %s\n", m_dir->name()); + Emsg1(M_ABORT, 0, "Failed to connect to %s for populateLists.\n", m_dir->name()); return; } populateLists(conn); @@ -209,7 +207,7 @@ bool Console::dir_cmd(const char *cmd, QStringList &results) dir_cmd(conn, cmd, results); return true; } else { - Pmsg1(000, "dir_cmd Seems to Failed to find a connection %s\n", m_dir->name()); + Pmsg1(000, "dir_cmd failed to connect to %s\n", m_dir->name()); return false; } } diff --git a/bacula/src/qt-console/main.cpp b/bacula/src/qt-console/main.cpp index 6e5064b75d..f212c03b19 100644 --- a/bacula/src/qt-console/main.cpp +++ b/bacula/src/qt-console/main.cpp @@ -1,7 +1,7 @@ /* Bacula® - The Network Backup Solution - Copyright (C) 2007-2009 Free Software Foundation Europe e.V. + Copyright (C) 2007-2010 Free Software Foundation Europe e.V. The main author of Bacula is Kern Sibbald, with contributions from many others, a complete list can be found in the file AUTHORS. @@ -26,8 +26,6 @@ Switzerland, email:ftf@fsfeurope.org. */ /* - * Version $Id$ - * * Main program for bat (qt-console) * * Kern Sibbald, January MMVII @@ -48,6 +46,8 @@ static void usage(); static int check_resources(); extern bool parse_bat_config(CONFIG *config, const char *configfile, int exit_code); +extern void message_callback(int /* type */, char *msg); + #define CONFIG_FILE "bat.conf" /* default configuration file */ @@ -74,7 +74,7 @@ int main(int argc, char *argv[]) batTranslator.load(QString("bat_") + QLocale::system().name()); app->installTranslator(&batTranslator); - + register_message_callback(message_callback); #ifdef xENABLE_NLS setlocale(LC_ALL, "");