From d75aa2102c7f6183c4db1d1dabfb0a972489dfdb Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Fri, 30 Oct 2009 14:32:52 +0100 Subject: abrt-debuginfo-install: tweaked comment Signed-off-by: Denys Vlasenko --- src/Daemon/abrt-debuginfo-install | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/Daemon') diff --git a/src/Daemon/abrt-debuginfo-install b/src/Daemon/abrt-debuginfo-install index 1f947cd..0bf174b 100755 --- a/src/Daemon/abrt-debuginfo-install +++ b/src/Daemon/abrt-debuginfo-install @@ -13,9 +13,10 @@ # If CACHEDIR is specified, debuginfos should be installed there. # If not, debuginfos should be installed into TEMPDIR. # -# Currently, we are called with CACHEDIR set to "/", but in the future -# it may be omitted or set to something else. script must be ready -# for those cases too. +# Currently, we are called with CACHEDIR set to "/var/cache/abrt-di", +# but in the future it may be omitted or set to something else. +# Script must be ready for those cases too. Consider, for example, +# corner cases of "" and "/". # # Output goes to GUI as debuginfo install log. The script should be careful # to give useful, but not overly cluttered info to stdout. -- cgit From 97b4cfbb26c87a79f5cf74fd67781486616f4541 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Fri, 30 Oct 2009 14:50:03 +0100 Subject: *: wire up /var/run/abrt in a few more places Signed-off-by: Denys Vlasenko --- src/Daemon/Daemon.cpp | 1 + src/Daemon/abrt-debuginfo-install | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'src/Daemon') diff --git a/src/Daemon/Daemon.cpp b/src/Daemon/Daemon.cpp index 9615ce8..b509b9f 100644 --- a/src/Daemon/Daemon.cpp +++ b/src/Daemon/Daemon.cpp @@ -654,6 +654,7 @@ static void sanitize_dump_dir_rights() { ensure_root_writable_dir(DEBUG_DUMPS_DIR); ensure_root_writable_dir(DEBUG_DUMPS_DIR"-di"); /* debuginfo cache */ + ensure_root_writable_dir(VAR_RUN"/abrt"); /* temp dir */ } int main(int argc, char** argv) diff --git a/src/Daemon/abrt-debuginfo-install b/src/Daemon/abrt-debuginfo-install index 0bf174b..ba9f9a1 100755 --- a/src/Daemon/abrt-debuginfo-install +++ b/src/Daemon/abrt-debuginfo-install @@ -71,7 +71,7 @@ test x"$cachedir" = x"" || test -d "$cachedir" || exit 2 # tempdir must not exist test -e "$tempdir" && exit 2 -mkdir "$tempdir" || exit 2 +mkdir -- "$tempdir" || exit 2 cd "$tempdir" || exit 2 $debug && echo "Installing rpms to $tempdir" -- cgit From 276a9017d63445dd322f9a93ff34e67cbdf97dc9 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Fri, 30 Oct 2009 19:17:10 +0100 Subject: lib/Plugins/Logger: much more sane dump format; fix misdetection of text files Signed-off-by: Denys Vlasenko --- src/Daemon/MiddleWare.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/Daemon') diff --git a/src/Daemon/MiddleWare.cpp b/src/Daemon/MiddleWare.cpp index 7c5bb41..2fd4f25 100644 --- a/src/Daemon/MiddleWare.cpp +++ b/src/Daemon/MiddleWare.cpp @@ -84,12 +84,14 @@ static void DebugDumpToCrashReport(const std::string& pDebugDumpDir, map_crash_r !dd.Exist(FILENAME_RELEASE) || !dd.Exist(FILENAME_EXECUTABLE)) { - throw CABRTException(EXCEP_ERROR, "DebugDumpToCrashReport(): One or more of important file(s)'re missing."); + throw CABRTException(EXCEP_ERROR, "DebugDumpToCrashReport(): One or more of important file(s)'re missing"); } + pCrashReport.clear(); dd.InitGetNextFile(); while (dd.GetNextFile(fileName, content, isTextFile)) { +VERB3 log(" file:'%s' text:%d", fileName.c_str(), isTextFile); if (!isTextFile) { add_crash_data_to_crash_report(pCrashReport, -- cgit