diff options
-rw-r--r-- | doc/HOW_TO_TEST | 2 | ||||
-rw-r--r-- | inc/CrashTypes.h | 2 | ||||
-rw-r--r-- | lib/Plugins/CCpp.cpp | 4 | ||||
-rw-r--r-- | lib/Plugins/Makefile.am | 2 | ||||
-rw-r--r-- | lib/Utils/Plugin.h | 2 | ||||
-rwxr-xr-x | scripts/abrt-bz-ratingfixer | 4 | ||||
-rw-r--r-- | src/Daemon/Daemon.cpp | 2 | ||||
-rw-r--r-- | src/Daemon/MiddleWare.cpp | 1 | ||||
-rw-r--r-- | src/Daemon/MiddleWare.h | 8 | ||||
-rw-r--r-- | src/Daemon/Settings.cpp | 6 | ||||
-rw-r--r-- | src/utils/abrt-backtrace.1 | 6 |
11 files changed, 20 insertions, 19 deletions
diff --git a/doc/HOW_TO_TEST b/doc/HOW_TO_TEST index 05641b1d..425a2b34 100644 --- a/doc/HOW_TO_TEST +++ b/doc/HOW_TO_TEST @@ -35,7 +35,7 @@ III. Reporting c) try to report every supported crash abrt detects C/C++, oops, python script d) try to report some crash with bad backtrace - this should fail e) repeat this with cli - + - test reporting with all reporters plugins like: ticketuploader, filetransport, etc.. repeating the step 'a' to 'e' diff --git a/inc/CrashTypes.h b/inc/CrashTypes.h index 87119ae0..4e80f8d9 100644 --- a/inc/CrashTypes.h +++ b/inc/CrashTypes.h @@ -31,7 +31,7 @@ #define FILENAME_BACKTRACE "backtrace" #define FILENAME_MEMORYMAP "memorymap" // Used by CCpp analyzer to cache GetGlobalUUID() calls. -#define FILENAME_GLOBAL_UUID "global_uuid" +#define FILENAME_GLOBAL_UUID "global_uuid" // Name of the function where the application crashed. // Optional. #define FILENAME_CRASH_FUNCTION "crash_function" diff --git a/lib/Plugins/CCpp.cpp b/lib/Plugins/CCpp.cpp index fc0bda3e..2911c9be 100644 --- a/lib/Plugins/CCpp.cpp +++ b/lib/Plugins/CCpp.cpp @@ -531,7 +531,7 @@ string CAnalyzerCCpp::GetGlobalUUID(const char *pDebugDumpDir) // Compatibility code. // This whole block should be deleted for Fedora 14. log(_("Getting global universal unique identification...")); - + string backtrace_path = concat_path_file(pDebugDumpDir, FILENAME_BACKTRACE); string executable; string package; @@ -633,7 +633,7 @@ string CAnalyzerCCpp::GetGlobalUUID(const char *pDebugDumpDir) /* else: no backtrace, independent_backtrace == "" */ string hash_base = package + executable + independent_backtrace; - return create_hash(hash_base.c_str()); + return create_hash(hash_base.c_str()); } } diff --git a/lib/Plugins/Makefile.am b/lib/Plugins/Makefile.am index fe6a6d9e..df27d87c 100644 --- a/lib/Plugins/Makefile.am +++ b/lib/Plugins/Makefile.am @@ -50,7 +50,7 @@ man_MANS = \ abrt-SQLite3.7 \ abrt-RunApp.7 \ abrt-TicketUploader.7 - + # + abrt-Catcut.7 EXTRA_DIST = $(man_MANS) diff --git a/lib/Utils/Plugin.h b/lib/Utils/Plugin.h index 3ae3d62d..059f8006 100644 --- a/lib/Utils/Plugin.h +++ b/lib/Utils/Plugin.h @@ -127,7 +127,7 @@ std::string make_description_catcut(const map_crash_data_t& pCrashData); /** * Loads settings and stores it in second parameter. On success it * returns true, otherwise returns false. - * + * * @param path A path of config file. * Config file consists of "key=value" lines. * @param settings A readed plugin's settings. diff --git a/scripts/abrt-bz-ratingfixer b/scripts/abrt-bz-ratingfixer index f774081d..d7881978 100755 --- a/scripts/abrt-bz-ratingfixer +++ b/scripts/abrt-bz-ratingfixer @@ -126,7 +126,7 @@ for buginfo in buginfos: if helper.returncode != 0: print "Problems with rating {0}".format(filename) continue - + # Get the comment count. We do not want to close bugs which # are in the middle of a discussion. bug = bz.getbug(buginfo.bug_id) @@ -185,7 +185,7 @@ def ownerCmp(a, b): return 0 else: return 1 - + print "============= SUMMARY" closedcount = 0 if options.wiki: diff --git a/src/Daemon/Daemon.cpp b/src/Daemon/Daemon.cpp index 143d8b4e..34f6f43a 100644 --- a/src/Daemon/Daemon.cpp +++ b/src/Daemon/Daemon.cpp @@ -835,8 +835,8 @@ int main(int argc, char** argv) VERB1 log("Adding signal pipe watch to glib main loop"); pGiochannel_signal = g_io_channel_unix_new(s_signal_pipe[0]); g_io_add_watch(pGiochannel_signal, G_IO_IN, handle_signal_cb, NULL); - /* Mark the territory */ + /* Mark the territory */ VERB1 log("Creating lock file"); if (Lock() != 0) throw 1; diff --git a/src/Daemon/MiddleWare.cpp b/src/Daemon/MiddleWare.cpp index 7792f5b8..a0ead478 100644 --- a/src/Daemon/MiddleWare.cpp +++ b/src/Daemon/MiddleWare.cpp @@ -484,6 +484,7 @@ report_status_t Report(const map_crash_data_t& client_report, map_analyzer_actions_and_reporters_t::iterator keyPtr = s_mapAnalyzerActionsAndReporters.find(key); if (keyPtr == end) { + VERB3 log("'%s' not found, looking for '%s'", key.c_str(), analyzer.c_str()); // if there is no such settings, then try default analyzer keyPtr = s_mapAnalyzerActionsAndReporters.find(analyzer); key = analyzer; diff --git a/src/Daemon/MiddleWare.h b/src/Daemon/MiddleWare.h index 4a2903c2..ac998872 100644 --- a/src/Daemon/MiddleWare.h +++ b/src/Daemon/MiddleWare.h @@ -87,15 +87,15 @@ void RunActionsAndReporters(const char *pDebugDumpDir); * fails, then default config is used. If pUID is emply string, default * config is used. * ...). - * @param crash_data + * @param crash_data * A crash report. * @param reporters * List of allowed reporters. Which reporters will be used depends - * on the analyzer of the crash_data. Reporters missing from this list + * on the analyzer of the crash_data. Reporters missing from this list * will not be used. - * @param caller_uid + * @param caller_uid * An user uid. - * @return + * @return * A report status, which reporters ends successfuly with messages. */ report_status_t Report(const map_crash_data_t& crash_data, diff --git a/src/Daemon/Settings.cpp b/src/Daemon/Settings.cpp index b8bdc9c6..99a5c8dc 100644 --- a/src/Daemon/Settings.cpp +++ b/src/Daemon/Settings.cpp @@ -383,13 +383,13 @@ void LoadSettings() ParseCommon(); ParseAnalyzerActionsAndReporters(); ParseCron(); - - /* + + /* loading gpg keys will invoke LoadOpenGPGPublicKey() from rpm.cpp pgpReadPkts which makes nss to re-init and thus makes bugzilla plugin work :-/ */ - + //FIXME FIXME FIXME FIXME FIXME FIXME!!! //if(g_settings_bOpenGPGCheck) LoadGPGKeys(); diff --git a/src/utils/abrt-backtrace.1 b/src/utils/abrt-backtrace.1 index ff7c2be2..96e0c445 100644 --- a/src/utils/abrt-backtrace.1 +++ b/src/utils/abrt-backtrace.1 @@ -6,8 +6,8 @@ abrt\-backtrace \- a backtrace analyzer for abrt [option]... [FILE] .SH DESCRIPTION .I abrt\-backtrace -is a command line tool that analyzes backtraces produced by -GDB and provides their textual representation useful for +is a command line tool that analyzes backtraces produced by +GDB and provides their textual representation useful for crash duplication detection. By default, abrt\-backtrace prints the backtrace tree created by @@ -31,7 +31,7 @@ unsupported format. .PP .B Various options .IP "\-n, \-\-single-thread" -Removes all threads except the one that caused the crash from +Removes all threads except the one that caused the crash from the internal representation of the backtrace. .IP "\-d=N, \-\-frame-depth=N" Display only the top N frames in every thread. |