abrt-action-rhtsupport: fix error handling
Fixing my recent breakage.
Run-tested.
--
vda
diff -x '*.po' -d -urpN abrt.3/src/daemon/abrt-action-rhtsupport.cpp
abrt.4/src/daemon/abrt-action-rhtsupport.cpp
--- abrt.3/src/daemon/abrt-action-rhtsupport.cpp 2010-10-20 18:35:13.000000000 +0200
+++ abrt.4/src/daemon/abrt-action-rhtsupport.cpp 2010-10-21 14:58:58.155109850 +0200
@@ -201,8 +201,35 @@ static void report_to_rhtsupport(
package,
tempfile
);
- VERB3 log("post result:'%s'", result);
- printf("STATUS:%s", result);
+ /* Temporary hackish detection of errors. Ideally,
+ * send_report_to_new_case needs to have better error reporting.
+ */
+ if (strncasecmp(result, "error", 5) == 0)
+ {
+ /*
+ * result can contain "...server says: 'multi-line <html>
text'"
+ * Replace all '\n' with spaces:
+ * we want this message to be, logically, one log entry.
+ * IOW: one line, not many lines.
+ */
+ char *src, *dst;
+ dst = src = result;
+ while (1)
+ {
+ unsigned char c = *src++;
+ if (c == '\n')
+ c = ' ';
+ *dst++ = c;
+ if (c == '\0')
+ break;
+ }
+ /* Use sanitized string as error message */
+ CABRTException e(EXCEP_PLUGIN, "%s", result);
+ free(result);
+ throw e;
+ }
+ /* No error */
+ printf("STATUS:%s\n", result);
free(result);
}