Merge branch 'master' of ssh://git.fedorahosted.org/git/abrt

2 files changed, 18 insertions, 12 deletions

diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index 1a3921b9..59e0f1a4 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -79,7 +79,7 @@ abrt_dump_oops_CPPFLAGS = \
     -D_GNU_SOURCE \
     -Wall -Werror
 abrt_dump_oops_LDADD = \
-    ../lib/libreport2.la
+    ../lib/libreport.la
 
 abrt_action_analyze_c_SOURCES = \
     abrt-action-analyze-c.c
@@ -98,7 +98,7 @@ abrt_action_analyze_c_CPPFLAGS = \
     -D_GNU_SOURCE \
     -Wall -Werror
 abrt_action_analyze_c_LDADD = \
-    ../lib/libreport2.la
+    ../lib/libreport.la
 
 abrt_action_analyze_python_SOURCES = \
     abrt-action-analyze-python.c
@@ -117,7 +117,7 @@ abrt_action_analyze_python_CPPFLAGS = \
     -D_GNU_SOURCE \
     -Wall -Werror
 abrt_action_analyze_python_LDADD = \
-    ../lib/libreport2.la
+    ../lib/libreport.la
 
 abrt_action_analyze_oops_SOURCES = \
     abrt-action-analyze-oops.c
@@ -136,7 +136,7 @@ abrt_action_analyze_oops_CPPFLAGS = \
     -D_GNU_SOURCE \
     -Wall -Werror
 abrt_action_analyze_oops_LDADD = \
-    ../lib/libreport2.la
+    ../lib/libreport.la
 
 abrt_action_generate_backtrace_SOURCES = \
     abrt-action-generate-backtrace.c
@@ -155,7 +155,7 @@ abrt_action_generate_backtrace_CPPFLAGS = \
     -D_GNU_SOURCE \
     -Wall -Werror
 abrt_action_generate_backtrace_LDADD = \
-    ../lib/libreport2.la \
+    ../lib/libreport.la \
     ../btparser/libbtparser.la
 
 abrt_action_bugzilla_SOURCES = \
@@ -177,7 +177,7 @@ abrt_action_bugzilla_CPPFLAGS = \
 abrt_action_bugzilla_LDADD = \
     $(GLIB_LIBS) \
     ../lib/libabrt_web.la \
-    ../lib/libreport2.la
+    ../lib/libreport.la
 
 abrt_action_rhtsupport_SOURCES = \
     abrt_rh_support.h abrt_rh_support.c \
@@ -202,7 +202,7 @@ abrt_action_rhtsupport_LDADD = \
     $(GLIB_LIBS) \
     $(XMLRPC_LIBS) $(XMLRPC_CLIENT_LIBS) \
     ../lib/libabrt_web.la \
-    ../lib/libreport2.la
+    ../lib/libreport.la
 
 abrt_action_upload_SOURCES = \
     abrt-action-upload.c
@@ -225,7 +225,7 @@ abrt_action_upload_LDFLAGS = -ltar
 abrt_action_upload_LDADD = \
     $(GLIB_LIBS) \
     $(CURL_LIBS) \
-    ../lib/libreport2.la
+    ../lib/libreport.la
 
 abrt_action_kerneloops_SOURCES = \
     abrt-action-kerneloops.c
@@ -245,7 +245,7 @@ abrt_action_kerneloops_CPPFLAGS = \
     -Wall -Werror
 abrt_action_kerneloops_LDADD = \
     ../lib/libabrt_web.la \
-    ../lib/libreport2.la
+    ../lib/libreport.la
 
 abrt_action_mailx_SOURCES = \
     abrt-action-mailx.c
@@ -264,7 +264,7 @@ abrt_action_mailx_CPPFLAGS = \
     -D_GNU_SOURCE \
     -Wall -Werror
 abrt_action_mailx_LDADD = \
-    ../lib/libreport2.la
+    ../lib/libreport.la
 
 abrt_action_print_SOURCES = \
     abrt-action-print.c
@@ -283,7 +283,7 @@ abrt_action_print_CPPFLAGS = \
     -D_GNU_SOURCE \
     -Wall -Werror
 abrt_action_print_LDADD = \
-    ../lib/libreport2.la
+    ../lib/libreport.la
 
 abrt_action_install_debuginfo_SOURCES = \
     abrt-action-install-debuginfo.c
@@ -305,7 +305,7 @@ abrt_retrace_client_SOURCES = \
      -D_GNU_SOURCE \
      -Wall -Werror
  abrt_retrace_client_LDADD = \
-     ../lib/libreport2.la \
+     ../lib/libreport.la \
      ../btparser/libbtparser.la \
      $(NSS_LIBS)
 
diff --git a/src/plugins/abrt-action-bugzilla.cpp b/src/plugins/abrt-action-bugzilla.cpp
index 1a391ae9..c77a2bad 100644
--- a/src/plugins/abrt-action-bugzilla.cpp
+++ b/src/plugins/abrt-action-bugzilla.cpp
@@ -449,6 +449,8 @@ xmlrpc_int32 ctx::new_bug(crash_data_t *crash_data, int depend_on_bugno)
     const char *package         = get_crash_item_content_or_NULL(crash_data, FILENAME_PACKAGE);
     const char *component       = get_crash_item_content_or_NULL(crash_data, FILENAME_COMPONENT);
     const char *release         = get_crash_item_content_or_NULL(crash_data, FILENAME_OS_RELEASE);
+    if (!release) /* Old dump dir format compat. Remove in abrt-2.1 */
+        release = get_crash_item_content_or_NULL(crash_data, "release");
     const char *arch            = get_crash_item_content_or_NULL(crash_data, FILENAME_ARCHITECTURE);
     const char *duphash         = get_crash_item_content_or_NULL(crash_data, FILENAME_DUPHASH);
     const char *reason          = get_crash_item_content_or_NULL(crash_data, FILENAME_REASON);
@@ -674,6 +676,8 @@ static void report_to_bugzilla(
     const char *component = get_crash_item_content_or_NULL(crash_data, FILENAME_COMPONENT);
     const char *duphash   = get_crash_item_content_or_NULL(crash_data, FILENAME_DUPHASH);
     const char *release   = get_crash_item_content_or_NULL(crash_data, FILENAME_OS_RELEASE);
+    if (!release) /* Old dump dir format compat. Remove in abrt-2.1 */
+        release = get_crash_item_content_or_NULL(crash_data, "release");
 
     ctx bz_server(bugzilla_xmlrpc, ssl_verify);
 
@@ -859,6 +863,8 @@ static void report_to_bugzilla(
         {
             const char* package    = get_crash_item_content_or_NULL(crash_data, FILENAME_PACKAGE);
             const char* release    = get_crash_item_content_or_NULL(crash_data, FILENAME_OS_RELEASE);
+            if (!release) /* Old dump dir format compat. Remove in abrt-2.1 */
+                release = get_crash_item_content_or_NULL(crash_data, "release");
             const char* arch       = get_crash_item_content_or_NULL(crash_data, FILENAME_ARCHITECTURE);
             const char* is_private = get_crash_item_content_or_NULL(crash_data, "is_private");