summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenys Vlasenko <dvlasenk@redhat.com>2011-03-09 15:13:36 +0100
committerDenys Vlasenko <dvlasenk@redhat.com>2011-03-09 15:13:36 +0100
commit1a55a94467587abb920dc37e38f339997374e8cc (patch)
tree6920dbf609b04dd1f41349411c90e7242afd1ff6
parentce92e8a6d7e4a4faaf4f3238ff14d6dc4d597846 (diff)
downloadabrt-1a55a94467587abb920dc37e38f339997374e8cc.tar.gz
abrt-1a55a94467587abb920dc37e38f339997374e8cc.tar.xz
abrt-1a55a94467587abb920dc37e38f339997374e8cc.zip
fix to parsing of /etc/abrt/events/*.conf files
Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
-rw-r--r--src/lib/event_config.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/lib/event_config.c b/src/lib/event_config.c
index 6700695e..4f8e8679 100644
--- a/src/lib/event_config.c
+++ b/src/lib/event_config.c
@@ -66,9 +66,13 @@ void load_event_config_data(void)
if (!conf && !xml)
continue;
- event_config_t *event_config = new_event_config();
-
char *fullname = concat_path_file(EVENTS_DIR, dent->d_name);
+
+ *ext = '\0';
+ event_config_t *event_config = get_event_config(dent->d_name);
+ if (!event_config)
+ event_config = new_event_config();
+
if (xml)
load_event_description_from_file(event_config, fullname);
if (conf)
@@ -103,9 +107,9 @@ void load_event_config_data(void)
free_map_string(keys_and_values);
}
+
free(fullname);
- *ext = '\0';
g_hash_table_replace(g_event_config_list, xstrdup(dent->d_name), event_config);
}
}