diff options
| author | Jiri Moskovcak <jmoskovc@redhat.com> | 2010-02-12 11:45:45 +0100 |
|---|---|---|
| committer | Jiri Moskovcak <jmoskovc@redhat.com> | 2010-02-12 11:45:45 +0100 |
| commit | e1fa46edbe469d15a4157eccca52a0a3261a2f58 (patch) | |
| tree | b38352e489a8bad62c8652091e2938e766d0116f /src/Daemon/Settings.cpp | |
| parent | bc7a0e7fc5dd53e691c0ddecaf47dbf4e9f284a4 (diff) | |
| parent | 3f50601035b949db58b336e693362b0dbf1c870f (diff) | |
Merge branch 'master' into rhel6
Diffstat (limited to 'src/Daemon/Settings.cpp')
| -rw-r--r-- | src/Daemon/Settings.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/Daemon/Settings.cpp b/src/Daemon/Settings.cpp index 9b0376b..5644d37 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 */ |