diff options
| author | Karel Klic <kklic@redhat.com> | 2010-01-26 09:18:34 +0100 |
|---|---|---|
| committer | Karel Klic <kklic@redhat.com> | 2010-01-26 09:18:34 +0100 |
| commit | 8271f36afcb46ae62d2163b9ee5ae5e116e86eb8 (patch) | |
| tree | f7eb151b199d69a77f52912bec642cac8badd814 /src | |
| parent | 6c189fb2d2e8dfcbd796529a23c99d30517255a6 (diff) | |
| parent | 4a1f21fd22497065049f7b88269b103b54d29df4 (diff) | |
Merge branch 'master' of git://git.fedorahosted.org/git/abrt
Diffstat (limited to 'src')
| -rw-r--r-- | src/Daemon/MiddleWare.cpp | 11 | ||||
| -rw-r--r-- | src/Daemon/abrt.conf | 8 |
2 files changed, 10 insertions, 9 deletions
diff --git a/src/Daemon/MiddleWare.cpp b/src/Daemon/MiddleWare.cpp index 40bee1a..a89070e 100644 --- a/src/Daemon/MiddleWare.cpp +++ b/src/Daemon/MiddleWare.cpp @@ -601,15 +601,16 @@ static mw_result_t SavePackageDescriptionToDebugDump( const char *basename = strrchr(pExecutable, '/'); if (basename) basename++; else basename = pExecutable; - /* Add "perl" and such as needed */ - if (strcmp(basename, "python") == 0) - { + /* Add more interpreters as needed */ + if (strcmp(basename, "python") == 0 + || strcmp(basename, "perl") == 0 + ) { // TODO: we don't verify that python executable is not modified // or that python package is properly signed // (see CheckFingerprint/CheckHash below) /* Try to find package for the script by looking at argv[1]. - * This will work only of the cmdline contains the whole path. + * This will work only if the cmdline contains the whole path. * Example: python /usr/bin/system-control-network */ char *script_name = get_argv1_if_full_path(cmdline); @@ -708,7 +709,7 @@ bool analyzer_has_AutoReportUIDs(const char *analyzer_name, const char *uid_str) if (it == settings.end()) return false; - if ((strcmp(analyzer_name, "Kerneloops") == 0) && (strcmp(uid, "-1") == 0)) + if ((strcmp(analyzer_name, "Kerneloops") == 0) && (strcmp(uid_str, "-1") == 0)) return true; /* diff --git a/src/Daemon/abrt.conf b/src/Daemon/abrt.conf index 406289f..bffc48d 100644 --- a/src/Daemon/abrt.conf +++ b/src/Daemon/abrt.conf @@ -13,8 +13,8 @@ BlackList = nspluginwrapper Database = SQLite3 # Max size for crash storage [MiB] MaxCrashReportsSize = 1000 -# Vector of actions and reporters which are activated immediately after a crash occurs, -# comma separated. +# Vector of actions and reporters which are activated immediately +# after a crash occurs, comma separated. #ActionsAndReporters = Mailx("[abrt] new crash was detected") #ActionsAndReporters = FileTransfer("store") ActionsAndReporters = RunApp("test x\"`cat component`\" = x\"xorg-x11-server-Xorg\" && cp /var/log/Xorg.0.log .") @@ -28,7 +28,7 @@ Python = Bugzilla, Logger # Which Action plugins to run repeatedly [ Cron ] -# h:m - at h:m an action plugin is activated -# s - every s seconds is an action plugin activated +# h:m - at h:m +# s - every s seconds 120 = KerneloopsScanner #02:00 = FileTransfer |