replace hardcoded "Red Hat Enterprise Linux", "6.0" by proper parsing

Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>

3 files changed, 18 insertions, 3 deletions

diff --git a/lib/Plugins/RHTSupport.cpp b/lib/Plugins/RHTSupport.cpp
index 50eee076..2091a8e0 100644
--- a/lib/Plugins/RHTSupport.cpp
+++ b/lib/Plugins/RHTSupport.cpp
@@ -233,11 +233,14 @@ string CReporterRHticket::Report(const map_crash_data_t& pCrashData,
     }
 
     {
+        map_crash_data_t::const_iterator it = pCrashData.find(FILENAME_RELEASE);
+        const char *release = (it != pCrashData.end()) ? it->second[CD_CONTENT].c_str() : "";
         update_client(_("Creating a new case..."));
         char* result = send_report_to_new_case(URL.c_str(),
                 login.c_str(),
                 password.c_str(),
                 ssl_verify,
+                release,
                 summary.c_str(),
                 description.c_str(),
                 package.c_str(),
diff --git a/lib/Utils/abrt_rh_support.cpp b/lib/Utils/abrt_rh_support.cpp
index e0d2438f..99e4ae8e 100644
--- a/lib/Utils/abrt_rh_support.cpp
+++ b/lib/Utils/abrt_rh_support.cpp
@@ -302,6 +302,7 @@ send_report_to_new_case(const char* baseURL,
                 const char* username,
                 const char* password,
                 bool ssl_verify,
+                const char* os_release,
                 const char* summary,
                 const char* description,
                 const char* component,
@@ -309,9 +310,19 @@ send_report_to_new_case(const char* baseURL,
 {
     string case_url = concat_path_file(baseURL, "/cases");
 
-    char *case_data = make_case_data(summary, description,
-                                         "Red Hat Enterprise Linux", "6.0",
-                                         component);
+    char *product = NULL;
+    char *version = NULL;
+    parse_release(os_release, &product, &version);
+
+    char *case_data = make_case_data(
+                summary,
+                description,
+                (product ? product : os_release),
+                (version ? version : "unknown"),
+                component
+    );
+    free(product);
+    free(version);
 
     int redirect_count = 0;
     char *errmsg;
diff --git a/lib/Utils/abrt_rh_support.h b/lib/Utils/abrt_rh_support.h
index 7393a481..8ea442de 100644
--- a/lib/Utils/abrt_rh_support.h
+++ b/lib/Utils/abrt_rh_support.h
@@ -38,6 +38,7 @@ send_report_to_new_case(const char* baseURL,
                 const char* username,
                 const char* password,
                 bool ssl_verify,
+                const char* os_release,
                 const char* summary,
                 const char* description,
                 const char* component,