summaryrefslogtreecommitdiffstats
path: root/lib/MiddleWare/MiddleWare.cpp
diff options
context:
space:
mode:
authorZdenek Prikryl <zprikryl@redhat.com>2009-03-04 11:37:30 +0100
committerZdenek Prikryl <zprikryl@redhat.com>2009-03-04 11:37:30 +0100
commit4eaf8b24b495aa654def79d1d4a5d6b3d1ade39b (patch)
tree8e87bc637db01b70e041a81b24b1bb4629f97e92 /lib/MiddleWare/MiddleWare.cpp
parent02f9b4ad59a0bc4a0b7969d05816e78ec8c9c8f0 (diff)
downloadabrt-4eaf8b24b495aa654def79d1d4a5d6b3d1ade39b.tar.gz
abrt-4eaf8b24b495aa654def79d1d4a5d6b3d1ade39b.tar.xz
abrt-4eaf8b24b495aa654def79d1d4a5d6b3d1ade39b.zip
changed class name
Diffstat (limited to 'lib/MiddleWare/MiddleWare.cpp')
-rw-r--r--lib/MiddleWare/MiddleWare.cpp26
1 files changed, 11 insertions, 15 deletions
diff --git a/lib/MiddleWare/MiddleWare.cpp b/lib/MiddleWare/MiddleWare.cpp
index 20ee48a..0d7fdf6 100644
--- a/lib/MiddleWare/MiddleWare.cpp
+++ b/lib/MiddleWare/MiddleWare.cpp
@@ -68,7 +68,7 @@ void CMiddleWare::LoadSettings(const std::string& pPath)
set_opengpg_keys_t::iterator it_k;
for (it_k = m_setOpenGPGKeys.begin(); it_k != m_setOpenGPGKeys.end(); it_k++)
{
- m_RPMInfo.LoadOpenGPGPublicKey(*it_k);
+ m_RPM.LoadOpenGPGPublicKey(*it_k);
}
}
if (settings.find("EnableOpenGPG") != settings.end())
@@ -281,10 +281,16 @@ int CMiddleWare::SaveDebugDump(const std::string& pDebugDumpDir, crash_info_t& p
dd.Open(pDebugDumpDir);
dd.LoadText(FILENAME_EXECUTABLE, executable);
- package = m_RPMInfo.GetPackage(executable, description);
- if (executable != "kernel")
+ if (executable == "kernel")
{
+ package = "kernel";
+ description = m_RPM.GetDescription(executable);
+ }
+ else
+ {
+ package = m_RPM.GetPackage(executable);
std::string packageName = package.substr(0, package.rfind("-", package.rfind("-") - 1));
+ description = m_RPM.GetDescription(executable);
if (packageName == "" ||
(m_setBlackList.find(packageName) != m_setBlackList.end()))
{
@@ -294,8 +300,8 @@ int CMiddleWare::SaveDebugDump(const std::string& pDebugDumpDir, crash_info_t& p
}
if (m_bOpenGPGCheck)
{
- if (!m_RPMInfo.CheckFingerprint(packageName) ||
- !m_RPMInfo.CheckHash(packageName, executable))
+ if (!m_RPM.CheckFingerprint(packageName) ||
+ !m_RPM.CheckHash(packageName, executable))
{
dd.Delete();
dd.Close();
@@ -303,16 +309,6 @@ int CMiddleWare::SaveDebugDump(const std::string& pDebugDumpDir, crash_info_t& p
}
}
}
- else
- {
- package = "kernel";
- description = "The Linux kernel";
- description += "\n\n";
- description += "The kernel contains the Linux kernel (vmlinuz), the core of any"
- "Linux operating system. The kernel handles the basic functions"
- "of the operating system: memory allocation, process allocation, device"
- "input and output, etc.";
- }
dd.SaveText(FILENAME_PACKAGE, package);
dd.SaveText(FILENAME_DESCRIPTION, description);