From c6287c4fe05e5f3557f121142dc8b53c701b1f07 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Fri, 22 Jan 2010 17:44:07 +0100 Subject: fix previous commit Signed-off-by: Denys Vlasenko --- src/Daemon/MiddleWare.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/Daemon/MiddleWare.cpp b/src/Daemon/MiddleWare.cpp index 40bee1a..5a12d76 100644 --- a/src/Daemon/MiddleWare.cpp +++ b/src/Daemon/MiddleWare.cpp @@ -708,7 +708,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; /* -- cgit From 99cb43dad2818d372b25663dc4237f13479f4fc4 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Mon, 25 Jan 2010 14:08:54 +0100 Subject: abrt.conf: remove some bad English Signed-off-by: Denys Vlasenko --- src/Daemon/abrt.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/Daemon/abrt.conf b/src/Daemon/abrt.conf index 406289f..4dae95d 100644 --- a/src/Daemon/abrt.conf +++ b/src/Daemon/abrt.conf @@ -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 -- cgit From 7a422cfae45da96ae65f557cb8db8d7165f2e2c4 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Mon, 25 Jan 2010 14:12:40 +0100 Subject: abrt.conf: wrap line >80chars Signed-off-by: Denys Vlasenko --- src/Daemon/abrt.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/Daemon/abrt.conf b/src/Daemon/abrt.conf index 4dae95d..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 .") -- cgit From 27263ba6c91c4e9aca43e4b7dbfb7998418f953a Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Mon, 25 Jan 2010 15:08:15 +0100 Subject: attribute SEGVs in perl to script's package, like we already do for python Signed-off-by: Denys Vlasenko --- src/Daemon/MiddleWare.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/Daemon/MiddleWare.cpp b/src/Daemon/MiddleWare.cpp index 5a12d76..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); -- cgit