diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | abrt.spec | 2 | ||||
| -rw-r--r-- | doc/IMPLEMENTATION | 4 | ||||
| -rw-r--r-- | src/Hooks/Makefile.am | 12 | ||||
| -rw-r--r-- | src/Hooks/abrt-pyhook-helper.cpp | 4 | ||||
| -rw-r--r-- | src/Hooks/abrt_exception_handler.py.in | 2 |
6 files changed, 13 insertions, 13 deletions
@@ -51,7 +51,7 @@ src/Gui/abrt.desktop src/Hooks/abrt_exception_handler.py src/Hooks/dumpoops src/Hooks/abrt-hook-ccpp -src/Hooks/abrt-pyhook-helper +src/Hooks/abrt-hook-python stamp-h1 x86_64/ abrt-* @@ -384,7 +384,7 @@ fi %files addon-python %defattr(-,root,root,-) -%attr(2755, root, abrt) %{_bindir}/%{name}-pyhook-helper +%attr(2755, root, abrt) %{_libexecdir}/abrt-hook-python %{_libdir}/%{name}/libPython.so* %{python_site}/*.py* diff --git a/doc/IMPLEMENTATION b/doc/IMPLEMENTATION index 6a7c1ba7..ae8ef71c 100644 --- a/doc/IMPLEMENTATION +++ b/doc/IMPLEMENTATION @@ -5,7 +5,7 @@ C/C++ handling: we change /proc/sys/kernel/core_pattern to invoke abrtd helper to save the coredump of crashing app: -* helper source code: http://git.fedorahosted.org/git/abrt.git?p=abrt.git;a=blob_plain;f=src/Hooks/abrt-pyhook-helper.cpp +* helper source code: http://git.fedorahosted.org/git/abrt.git?p=abrt.git;a=blob_plain;f=src/Hooks/abrt-hook-python.cpp the code responsible for this: #define CORE_PATTERN "|/usr/libexec/abrt-hook-ccpp" "/var/cache/abrt" %p %s %u" @@ -21,7 +21,7 @@ the code responsible for this: %s - signal %u - uid -when some crash occures abrt-hook-ccpp is invoked to store the coredump and some other info +when some crash occurs abrt-hook-ccpp is invoked to store the coredump and some other info read from /proc/<pid>/: executable: diff --git a/src/Hooks/Makefile.am b/src/Hooks/Makefile.am index af51d99a..eb71a451 100644 --- a/src/Hooks/Makefile.am +++ b/src/Hooks/Makefile.am @@ -1,5 +1,5 @@ libexec_PROGRAMS = abrt-hook-ccpp -bin_PROGRAMS = dumpoops abrt-pyhook-helper +bin_PROGRAMS = dumpoops abrt-hook-python # CCpp abrt_hook_ccpp_SOURCES = \ @@ -32,17 +32,17 @@ dumpoops_LDADD = \ ../../lib/Utils/libABRTUtils.la \ ../../lib/Utils/libABRTdUtils.la -# abrt-pyhook-helper -abrt_pyhook_helper_SOURCES = \ - abrt-pyhook-helper.cpp -abrt_pyhook_helper_CPPFLAGS = \ +# abrt-hook-python +abrt_hook_python_SOURCES = \ + abrt-hook-python.cpp +abrt_hook_python_CPPFLAGS = \ -I$(srcdir)/../../inc \ -I$(srcdir)/../../lib/Utils \ -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" \ -DCONF_DIR=\"$(CONF_DIR)\" \ -DVAR_RUN=\"$(VAR_RUN)\" \ -D_GNU_SOURCE -abrt_pyhook_helper_LDADD = \ +abrt_hook_python_LDADD = \ ../../lib/Utils/libABRTUtils.la python_PYTHON = sitecustomize.py abrt_exception_handler.py diff --git a/src/Hooks/abrt-pyhook-helper.cpp b/src/Hooks/abrt-pyhook-helper.cpp index 0d15d78f..cd17e402 100644 --- a/src/Hooks/abrt-pyhook-helper.cpp +++ b/src/Hooks/abrt-pyhook-helper.cpp @@ -1,5 +1,5 @@ /* - abrt-pyhook-helper.cpp - writes data to the /var/cache/abrt directory + abrt-hook-python.cpp - writes data to the /var/cache/abrt directory with SUID bit Copyright (C) 2009 RedHat inc. @@ -67,7 +67,7 @@ int main(int argc, char** argv) default: usage: error_msg_and_die( - "Usage: abrt-pyhook-helper [OPTIONS] <BACKTRACE\n" + "Usage: abrt-hook-python [OPTIONS] <BACKTRACE\n" "\nOptions:\n" " -p,--pid PID PID of process that caused the crash\n" " -p,--executable PATH absolute path to the program that crashed\n" diff --git a/src/Hooks/abrt_exception_handler.py.in b/src/Hooks/abrt_exception_handler.py.in index a8da9808..b5ec35f3 100644 --- a/src/Hooks/abrt_exception_handler.py.in +++ b/src/Hooks/abrt_exception_handler.py.in @@ -107,7 +107,7 @@ def write_dump(pid, tb_uuid, tb): if sys.argv[0]: executable = os.path.abspath(sys.argv[0]) - command = ["abrt-pyhook-helper"] + command = ["/usr/libexec/abrt-hook-python"] command.append("--pid=%s" % pid) command.append("--executable=%s" % executable) command.append("--uuid=%s" % tb_uuid) |