summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarel Klic <kklic@redhat.com>2010-02-12 13:25:55 +0100
committerKarel Klic <kklic@redhat.com>2010-02-12 13:25:55 +0100
commit349ee9dff57f6fe232a7fc146cba7581402daa32 (patch)
tree0c3b6805286467958640523cbef14b9a33bf5826
parentea024040e517732f4c1195f9d804624d3a876671 (diff)
parent3f50601035b949db58b336e693362b0dbf1c870f (diff)
downloadabrt-349ee9dff57f6fe232a7fc146cba7581402daa32.tar.gz
abrt-349ee9dff57f6fe232a7fc146cba7581402daa32.tar.xz
abrt-349ee9dff57f6fe232a7fc146cba7581402daa32.zip
Merge branch 'master' of git://git.fedorahosted.org/git/abrt
-rw-r--r--src/Daemon/Settings.cpp12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/Daemon/Settings.cpp b/src/Daemon/Settings.cpp
index 9b0376b3..5644d370 100644
--- a/src/Daemon/Settings.cpp
+++ b/src/Daemon/Settings.cpp
@@ -376,8 +376,16 @@ void LoadSettings()
ParseCommon();
ParseAnalyzerActionsAndReporters();
ParseCron();
- if(g_settings_bOpenGPGCheck)
- LoadGPGKeys();
+
+ /*
+ loading gpg keys will invoke LoadOpenGPGPublicKey() from rpm.cpp
+ pgpReadPkts which makes nss to re-init and thus makes
+ bugzilla plugin work :-/
+ */
+
+ //FIXME FIXME FIXME FIXME FIXME FIXME!!!
+ //if(g_settings_bOpenGPGCheck)
+ LoadGPGKeys();
}
/* dbus call to retrieve .conf file data from daemon */