diff options
author | Denys Vlasenko <dvlasenk@redhat.com> | 2011-05-16 23:10:37 +0200 |
---|---|---|
committer | Denys Vlasenko <dvlasenk@redhat.com> | 2011-05-16 23:10:37 +0200 |
commit | 79085fda802056f096b61a526e95e08136faf95d (patch) | |
tree | 177f885f6ae86976e5d2b22c07b0c3755a4f9701 /src/plugins | |
parent | 554dc681d36b7e1cb306eb8d7ce5958a87dfc397 (diff) | |
download | abrt-79085fda802056f096b61a526e95e08136faf95d.tar.gz abrt-79085fda802056f096b61a526e95e08136faf95d.tar.xz abrt-79085fda802056f096b61a526e95e08136faf95d.zip |
Remove .py from abrt-action-install-debuginfo.py
Rename abrt-action-install-debuginfo to
abrt-action-install-debuginfo-to-abrt-cache
Yes, it's ugly long...
Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
Diffstat (limited to 'src/plugins')
-rw-r--r-- | src/plugins/Makefile.am | 14 | ||||
-rw-r--r--[-rwxr-xr-x] | src/plugins/abrt-action-install-debuginfo (renamed from src/plugins/abrt-action-install-debuginfo.py) | 6 | ||||
-rw-r--r-- | src/plugins/abrt-action-install-debuginfo-to-abrt-cache.c (renamed from src/plugins/abrt-action-install-debuginfo.c) | 4 | ||||
-rw-r--r-- | src/plugins/ccpp_events.conf | 2 |
4 files changed, 14 insertions, 12 deletions
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am index 37974dca..e5bcf7dc 100644 --- a/src/plugins/Makefile.am +++ b/src/plugins/Makefile.am @@ -3,7 +3,7 @@ pluginslibdir = $(PLUGINS_LIB_DIR) bin_SCRIPTS = \ - abrt-action-install-debuginfo.py \ + abrt-action-install-debuginfo \ abrt-action-analyze-core.py \ abrt-action-list-dsos.py @@ -21,7 +21,7 @@ bin_PROGRAMS = \ abrt-action-upload \ abrt-action-mailx \ abrt-action-print \ - abrt-action-install-debuginfo \ + abrt-action-install-debuginfo-to-abrt-cache \ abrt-retrace-client pluginsconfdir = $(PLUGINS_CONF_DIR) @@ -83,7 +83,7 @@ man1_MANS = ${MAN_TXT:%.txt=%.1} CLEANFILES = $(man1_MANS) PYTHON_FILES = \ - abrt-action-install-debuginfo.py \ + abrt-action-install-debuginfo \ abrt-action-list-dsos.py \ abrt-action-analyze-core.py @@ -366,14 +366,14 @@ abrt_action_print_CPPFLAGS = \ abrt_action_print_LDADD = \ ../lib/libreport.la -abrt_action_install_debuginfo_SOURCES = \ - abrt-action-install-debuginfo.c -abrt_action_install_debuginfo_CPPFLAGS = \ +abrt_action_install_debuginfo_to_abrt_cache_SOURCES = \ + abrt-action-install-debuginfo-to-abrt-cache.c +abrt_action_install_debuginfo_to_abrt_cache_CPPFLAGS = \ -I$(srcdir)/../include/report -I$(srcdir)/../include \ -I$(srcdir)/../lib \ -D_GNU_SOURCE \ -Wall -Wwrite-strings -abrt_action_install_debuginfo_LDADD = +abrt_action_install_debuginfo_to_abrt_cache_LDADD = abrt_retrace_client_SOURCES = \ abrt-retrace-client.c diff --git a/src/plugins/abrt-action-install-debuginfo.py b/src/plugins/abrt-action-install-debuginfo index 1a697744..75079ff9 100755..100644 --- a/src/plugins/abrt-action-install-debuginfo.py +++ b/src/plugins/abrt-action-install-debuginfo @@ -3,7 +3,7 @@ # WARNING: python -u means unbuffered I/O without it the messages are # passed to the parent asynchronously which looks bad in clients. -PROGNAME = "abrt-action-install-debuginfo.py" +PROGNAME = "abrt-action-install-debuginfo" import sys import os @@ -380,6 +380,7 @@ def sigterm_handler(signum, frame): def sigint_handler(signum, frame): clean_up() print "\n", _("Exiting on user command") + sys.stdout.flush() # ??! without "sys.", I am getting segv! sys.exit(RETURN_OK) @@ -481,7 +482,8 @@ if __name__ == "__main__": # # We can do it as a separate step in abrt_event.conf, but this # would require setuid'ing abrt-action-trim-files to abrt:abrt. - # Since we (abrt-action-install-debuginfo) are already running setuid, + # Since we (via abrt-action-install-debuginfo-to-abrt-cache) + # are already running setuid, # it makes sense to NOT setuid abrt-action-trim-files too, # but instead run it as our child: sys.stdout.flush() diff --git a/src/plugins/abrt-action-install-debuginfo.c b/src/plugins/abrt-action-install-debuginfo-to-abrt-cache.c index 0d5d0d9d..8e96f781 100644 --- a/src/plugins/abrt-action-install-debuginfo.c +++ b/src/plugins/abrt-action-install-debuginfo-to-abrt-cache.c @@ -21,7 +21,7 @@ #include <stdlib.h> #include <string.h> -#define EXECUTABLE "abrt-action-install-debuginfo.py" +#define EXECUTABLE "abrt-action-install-debuginfo" static void error_msg_and_die(const char *msg, const char *arg) { @@ -80,7 +80,7 @@ int main(int argc, char **argv) /* Prevent malicious user from messing up with suid'ed process: */ /* Set safe PATH */ // TODO: honor configure --prefix here by adding it to PATH -// (otherwise abrt-action-install-debuginfo.py would fail to spawn abrt-action-trim-files): +// (otherwise abrt-action-install-debuginfo would fail to spawn abrt-action-trim-files): if (u == 0) putenv((char*) "PATH=/usr/sbin:/sbin:/usr/bin:/bin"); else diff --git a/src/plugins/ccpp_events.conf b/src/plugins/ccpp_events.conf index d68cb30d..5daf71a1 100644 --- a/src/plugins/ccpp_events.conf +++ b/src/plugins/ccpp_events.conf @@ -25,7 +25,7 @@ EVENT=analyze_xsession_errors analyzer=CCpp # or was this ability lost with move to python installer? EVENT=analyze_LocalGDB analyzer=CCpp abrt-action-analyze-core.py --core=coredump -o build_ids && - abrt-action-install-debuginfo --size_mb=4096 && + abrt-action-install-debuginfo-to-abrt-cache --size_mb=4096 && abrt-action-generate-backtrace && abrt-action-analyze-backtrace |