From f8c0e544a905ba42c8b550409f492081534977f5 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Thu, 10 Feb 2011 15:48:15 +0100 Subject: get rid of FILENAME_DESCRIPTION, rename "release" to "os_release" Signed-off-by: Denys Vlasenko --- src/daemon/MiddleWare.cpp | 2 +- src/daemon/abrt-action-save-package-data.c | 9 --------- src/daemon/rpm.c | 21 --------------------- src/daemon/rpm.h | 6 ------ 4 files changed, 1 insertion(+), 37 deletions(-) (limited to 'src/daemon') diff --git a/src/daemon/MiddleWare.cpp b/src/daemon/MiddleWare.cpp index 906b1464..cdb5c072 100644 --- a/src/daemon/MiddleWare.cpp +++ b/src/daemon/MiddleWare.cpp @@ -54,7 +54,7 @@ static crash_data_t *DebugDumpToCrashReport(const char *dump_dir_name) FILENAME_KERNEL , FILENAME_PACKAGE , FILENAME_COMPONENT , - FILENAME_RELEASE , + FILENAME_OS_RELEASE , FILENAME_EXECUTABLE , NULL }; diff --git a/src/daemon/abrt-action-save-package-data.c b/src/daemon/abrt-action-save-package-data.c index 8ddd1d8c..d87ffd59 100644 --- a/src/daemon/abrt-action-save-package-data.c +++ b/src/daemon/abrt-action-save-package-data.c @@ -91,7 +91,6 @@ static int SavePackageDescriptionToDebugDump(const char *dump_dir_name) char *package_short_name = NULL; char *component = NULL; char *script_name = NULL; /* only if "interpreter /path/to/script" */ - char *dsc = NULL; /* note: "goto ret" statements below free all the above variables, * but they don't dd_close(dd) */ @@ -100,7 +99,6 @@ static int SavePackageDescriptionToDebugDump(const char *dump_dir_name) component = xstrdup("kernel"); package_full_name = xstrdup("kernel"); package_short_name = xstrdup("kernel"); - dsc = rpm_get_description(package_short_name); } else { @@ -124,7 +122,6 @@ static int SavePackageDescriptionToDebugDump(const char *dump_dir_name) if (!dd) goto ret; /* return 1 (failure) */ dd_save_text(dd, FILENAME_PACKAGE, ""); - dd_save_text(dd, FILENAME_DESCRIPTION, "Crashed executable does not belong to any installed package"); dd_save_text(dd, FILENAME_COMPONENT, ""); //TODO: move hostname saving to a more logical place if (!remote) @@ -220,7 +217,6 @@ static int SavePackageDescriptionToDebugDump(const char *dump_dir_name) } component = rpm_get_component(executable); - dsc = rpm_get_description(package_short_name); dd = dd_opendir(dump_dir_name, /*flags:*/ 0); if (!dd) @@ -231,10 +227,6 @@ static int SavePackageDescriptionToDebugDump(const char *dump_dir_name) { dd_save_text(dd, FILENAME_PACKAGE, package_full_name); } - if (dsc) - { - dd_save_text(dd, FILENAME_DESCRIPTION, dsc); - } if (component) { dd_save_text(dd, FILENAME_COMPONENT, component); @@ -262,7 +254,6 @@ static int SavePackageDescriptionToDebugDump(const char *dump_dir_name) free(package_short_name); free(component); free(script_name); - free(dsc); return error; } diff --git a/src/daemon/rpm.c b/src/daemon/rpm.c index 25f95e8c..1295211e 100644 --- a/src/daemon/rpm.c +++ b/src/daemon/rpm.c @@ -170,27 +170,6 @@ error: } */ -char* rpm_get_description(const char* pkg) -{ - char *dsc = NULL; - const char *errmsg = NULL; - rpmts ts = rpmtsCreate(); - - rpmdbMatchIterator iter = rpmtsInitIterator(ts, RPMTAG_NAME, pkg, 0); - Header header = rpmdbNextIterator(iter); - if (!header) - goto error; - - dsc = headerFormat(header, "%{SUMMARY}\n\n%{DESCRIPTION}", &errmsg); - if (!dsc && errmsg) - error_msg("cannot get summary and description. reason: %s", errmsg); - -error: - rpmdbFreeIterator(iter); - rpmtsFree(ts); - return dsc; -} - char* rpm_get_component(const char* filename) { char *ret = NULL; diff --git a/src/daemon/rpm.h b/src/daemon/rpm.h index 12b11ca8..11f02809 100644 --- a/src/daemon/rpm.h +++ b/src/daemon/rpm.h @@ -57,12 +57,6 @@ void rpm_load_gpgkey(const char* filename); */ int rpm_chk_fingerprint(const char* pkg); -/** - * Gets a package description. - * @param pkg A package name. - * @return A package description. - */ -char* rpm_get_description(const char* pkg); /** * Gets a package name. This package contains particular * file. If the file doesn't belong to any package, empty string is -- cgit