diff options
| author | Karel Klic <kklic@redhat.com> | 2010-01-29 19:23:10 +0100 |
|---|---|---|
| committer | Karel Klic <kklic@redhat.com> | 2010-01-29 19:23:10 +0100 |
| commit | 7aae66521f29bd63b8a20e51f5f1842eaa39ca90 (patch) | |
| tree | b1cf022c06b23960fbb3c0a9faed45e9fa79bcb9 /src | |
| parent | b1a697faada74f7fbb7a9c239270436c9bcafbd8 (diff) | |
| parent | 1672bd412fa0f859687b578a81e1fcb3c2079c80 (diff) | |
| download | abrt-7aae66521f29bd63b8a20e51f5f1842eaa39ca90.tar.gz abrt-7aae66521f29bd63b8a20e51f5f1842eaa39ca90.tar.xz abrt-7aae66521f29bd63b8a20e51f5f1842eaa39ca90.zip | |
Merge branch 'master' of ssh://git.fedorahosted.org/git/abrt
Diffstat (limited to 'src')
| -rw-r--r-- | src/Daemon/MiddleWare.cpp | 4 | ||||
| -rw-r--r-- | src/Gui/SettingsDialog.py | 11 |
2 files changed, 10 insertions, 5 deletions
diff --git a/src/Daemon/MiddleWare.cpp b/src/Daemon/MiddleWare.cpp index f69c8a30..2786938d 100644 --- a/src/Daemon/MiddleWare.cpp +++ b/src/Daemon/MiddleWare.cpp @@ -688,7 +688,9 @@ static mw_result_t SavePackageDescriptionToDebugDump( dd.Open(pDebugDumpDir); dd.SaveText(FILENAME_PACKAGE, package.c_str()); dd.SaveText(FILENAME_DESCRIPTION, description.c_str()); - dd.SaveText(FILENAME_COMPONENT, component.c_str()); + /* For oopses, pExecutable == "kernel" gives "" here. Don't write it */ + if (component.size() != 0) + dd.SaveText(FILENAME_COMPONENT, component.c_str()); } catch (CABRTException& e) { diff --git a/src/Gui/SettingsDialog.py b/src/Gui/SettingsDialog.py index 893c23f0..a69a68ec 100644 --- a/src/Gui/SettingsDialog.py +++ b/src/Gui/SettingsDialog.py @@ -103,10 +103,13 @@ class SettingsDialog: ## MaxCrashSize self.builder.get_object("sbMaxCrashReportsSize").set_value(float(common["MaxCrashReportsSize"])) ## GPG keys - self.builder.get_object("eOpenGPGPublicKeys").set_text(common["OpenGPGPublicKeys"]) - self.gpgkeys = common["OpenGPGPublicKeys"].split(',') - for gpgkey in self.gpgkeys: - self.GPGKeysListStore.append([gpgkey]) + try: + self.builder.get_object("eOpenGPGPublicKeys").set_text(common["OpenGPGPublicKeys"]) + self.gpgkeys = common["OpenGPGPublicKeys"].split(',') + for gpgkey in self.gpgkeys: + self.GPGKeysListStore.append([gpgkey]) + except: + pass ## blacklist self.builder.get_object("eBlacklist").set_text(common["BlackList"]) |