From 4b0b36eb31c74383409609f2567e71bc5de3dacd Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Thu, 7 Oct 2010 16:08:48 +0200 Subject: add a bit more logging in places. fix typos Signed-off-by: Denys Vlasenko --- inc/abrtlib.h | 9 +++++++++ src/gui/ABRTPlugin.py | 6 ++++-- src/gui/ConfBackend.py | 2 +- src/gui/PluginsSettingsDialog.py | 2 +- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/inc/abrtlib.h b/inc/abrtlib.h index 2daf6005..0aae4a00 100644 --- a/inc/abrtlib.h +++ b/inc/abrtlib.h @@ -116,12 +116,21 @@ unsigned long long monotonic_us(void); unsigned monotonic_sec(void); enum { + /* on return, pipefds[1] is fd to which parent may write + * and deliver data to child's stdin: */ EXECFLG_INPUT = 1 << 0, + /* on return, pipefds[0] is fd from which parent may read + * child's stdout: */ EXECFLG_OUTPUT = 1 << 1, + /* open child's stdin to /dev/null: */ EXECFLG_INPUT_NUL = 1 << 2, + /* open child's stdout to /dev/null: */ EXECFLG_OUTPUT_NUL = 1 << 3, + /* redirect child's stderr to stdout: */ EXECFLG_ERR2OUT = 1 << 4, + /* open child's stderr to /dev/null: */ EXECFLG_ERR_NUL = 1 << 5, + /* suppress perror_msg("Can't execute 'foo'") if exec fails */ EXECFLG_QUIET = 1 << 6, EXECFLG_SETGUID = 1 << 7, EXECFLG_SETSID = 1 << 8, diff --git a/src/gui/ABRTPlugin.py b/src/gui/ABRTPlugin.py index c54f670c..e01d4b93 100644 --- a/src/gui/ABRTPlugin.py +++ b/src/gui/ABRTPlugin.py @@ -35,11 +35,12 @@ class PluginSettings(dict): def load_daemon_settings(self, name, daemon_settings): # load settings from daemon for key in daemon_settings.keys(): + log2("daemon-side setting: %s[%s]='%s'", name, key, daemon_settings[key]) self[str(key)] = str(daemon_settings[key]) if self.client_side_conf: - # FIXME: this fails when gk-authoriaztion fails - # we need to show a dialog to user and let him know + # FIXME: this fails when gk-authorization fails. + # We need to show a dialog to user and let him know # for now just silently ignore it to avoid rhbz#559342 settings = {} try: @@ -51,6 +52,7 @@ class PluginSettings(dict): # only rewrite keys which exist in plugin's keys. # e.g. we don't want a password field for logger plugin if key in daemon_settings.keys(): + log2("client-side override: %s[%s]='%s'", name, key, settings[key]) self[str(key)] = str(settings[key]) def save_on_client_side(self, name): diff --git a/src/gui/ConfBackend.py b/src/gui/ConfBackend.py index c4cdc518..ca362a6b 100644 --- a/src/gui/ConfBackend.py +++ b/src/gui/ConfBackend.py @@ -88,7 +88,7 @@ class ConfBackendGnomeKeyring(ConfBackend): settings_tmp["Application"] = "abrt" settings_tmp["AbrtPluginInfo"] = name - # delete all keyring items containg "AbrtPluginInfo":"", + # delete all keyring items containing "AbrtPluginInfo":"", # so we always have only 1 item per plugin try: item_list = gkey.find_items_sync(gkey.ITEM_GENERIC_SECRET, { "AbrtPluginInfo": str(name) }) diff --git a/src/gui/PluginsSettingsDialog.py b/src/gui/PluginsSettingsDialog.py index 1c42b255..dfeeb905 100644 --- a/src/gui/PluginsSettingsDialog.py +++ b/src/gui/PluginsSettingsDialog.py @@ -146,7 +146,7 @@ class PluginsSettingsDialog: def on_bConfigurePlugin_clicked(self, button, pluginview): pluginsListStore, path = pluginview.get_selection().get_selected_rows() if not path: - gui_info_dialog(_("Please select a plugin from the list to edit it's options."), parent=self.window) + gui_info_dialog(_("Please select a plugin from the list to edit its options."), parent=self.window) return # this should work until we keep the row object in the last position pluginfo = pluginsListStore.get_value(pluginsListStore.get_iter(path[0]), pluginsListStore.get_n_columns()-1) -- cgit