diff options
| -rw-r--r-- | lib/Plugins/KerneloopsReporter.cpp | 7 | ||||
| -rw-r--r-- | src/Gui/CCMainWindow.py | 4 | ||||
| -rw-r--r-- | src/Gui/CC_gui_functions.py | 8 | ||||
| -rw-r--r-- | src/Hooks/sitecustomize.py | 6 |
4 files changed, 16 insertions, 9 deletions
diff --git a/lib/Plugins/KerneloopsReporter.cpp b/lib/Plugins/KerneloopsReporter.cpp index 29094e8..26430be 100644 --- a/lib/Plugins/KerneloopsReporter.cpp +++ b/lib/Plugins/KerneloopsReporter.cpp @@ -113,7 +113,12 @@ std::string CKerneloopsReporter::Report(const map_crash_report_t& pCrashReport, /* FIXME: be more informative */ throw CABRTException(EXCEP_PLUGIN, "CKerneloopsReporter::Report(): Report has not been sent"); } - return "Kernel oops report was uploaded."; + /* Server replies with: + * 200 thank you for submitting the kernel oops information + * RemoteIP: 34192fd15e34bf60fac6a5f01bba04ddbd3f0558 + * - no URL or bug ID apparently... + */ + return "Kernel oops report was uploaded"; } void CKerneloopsReporter::SetSettings(const map_plugin_settings_t& pSettings) diff --git a/src/Gui/CCMainWindow.py b/src/Gui/CCMainWindow.py index d97b34e..e429908 100644 --- a/src/Gui/CCMainWindow.py +++ b/src/Gui/CCMainWindow.py @@ -218,7 +218,9 @@ class MainWindow(): dump = dumpsListStore.get_value(dumpsListStore.get_iter(path[0]), dumpsListStore.get_n_columns()-1) #move this to Dump class if dump.isReported(): - report_label = _("<b>This crash has been reported, you can find the report(s) at:</b>\n") + report_label = _("<b>This crash has been reported:</b>\n") + # plugin message follows, but at least in case of kerneloops, + # it is not informative (no URL to the report) for message in dump.getMessage().split('\n'): if message: if "http" in message[0:5] or "file:///"[0:8] in message: diff --git a/src/Gui/CC_gui_functions.py b/src/Gui/CC_gui_functions.py index ba895c6..dfed224 100644 --- a/src/Gui/CC_gui_functions.py +++ b/src/Gui/CC_gui_functions.py @@ -206,24 +206,24 @@ def get_icon_for_package(theme,package): return gtk.gdk.pixbuf_new_from_file_at_size(icon_filename,22,22) else: return None - + def show_log(log, parent=None): builder = gtk.Builder() builderfile = "%s%sdialogs.glade" % (sys.path[0],"/") builder.add_from_file(builderfile) dialog = builder.get_object("LogViewer") tevLog = builder.get_object("tevLog") - + if parent: dialog.set_position (gtk.WIN_POS_CENTER_ON_PARENT) dialog.set_transient_for(parent) else: dialog.set_position (gtk.WIN_POS_CENTER) - + buff = gtk.TextBuffer() buff.set_text(log) tevLog.set_buffer(buff) - + dialog.run() dialog.destroy() diff --git a/src/Hooks/sitecustomize.py b/src/Hooks/sitecustomize.py index 97941e8..8027726 100644 --- a/src/Hooks/sitecustomize.py +++ b/src/Hooks/sitecustomize.py @@ -13,12 +13,12 @@ def abrt_daemon_ok(): except Exception, ex: # log the exception? return False - + pid = pidfile.readline() pidfile.close() if not pid: return False - + try: # pid[:-1] strips the trailing '\n' cmdline = open("/proc/%s/cmdline" % pid[:-1], "r").readline() @@ -27,7 +27,7 @@ def abrt_daemon_ok(): return False if not ("abrtd" in cmdline): return False - + return True if abrt_daemon_ok(): |