diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | abrt.spec.in | 4 | ||||
| -rw-r--r-- | po/POTFILES.in | 2 | ||||
| -rw-r--r-- | po/abrt.pot | 56 | ||||
| -rw-r--r-- | src/cli/Makefile.am | 2 | ||||
| -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 |
9 files changed, 47 insertions, 45 deletions
@@ -19,7 +19,7 @@ src/plugins/abrt-action-upload src/plugins/abrt-action-mailx src/plugins/abrt-action-print src/plugins/abrt-dump-oops -src/plugins/abrt-action-install-debuginfo +src/plugins/abrt-action-install-debuginfo-to-abrt-cache src/plugins/abrt-retrace-client src/plugins/abrt-action-analyze-backtrace src/plugins/abrt-action-trim-files diff --git a/abrt.spec.in b/abrt.spec.in index b7ef9aa3..b68a13c7 100644 --- a/abrt.spec.in +++ b/abrt.spec.in @@ -509,9 +509,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_libexecdir}/abrt-hook-ccpp %{_bindir}/abrt-action-analyze-c %{_bindir}/abrt-action-trim-files -%attr(4755, abrt, abrt) %{_bindir}/abrt-action-install-debuginfo +%attr(4755, abrt, abrt) %{_bindir}/abrt-action-install-debuginfo-to-abrt-cache %{_bindir}/abrt-action-analyze-core.py* -%{_bindir}/abrt-action-install-debuginfo.py* +%{_bindir}/abrt-action-install-debuginfo %{_bindir}/abrt-action-generate-backtrace %{_bindir}/abrt-action-analyze-backtrace %{_bindir}/abrt-action-list-dsos.py* diff --git a/po/POTFILES.in b/po/POTFILES.in index 43961ada..4dfeb17a 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -27,7 +27,7 @@ src/plugins/abrt-action-analyze-oops.c src/plugins/abrt-action-analyze-python.c src/plugins/abrt-action-bugzilla.c src/plugins/abrt-action-generate-backtrace.c -src/plugins/abrt-action-install-debuginfo.py +src/plugins/abrt-action-install-debuginfo src/plugins/abrt-action-kerneloops.c src/plugins/abrt-action-mailx.c src/plugins/abrt-action-print.c diff --git a/po/abrt.pot b/po/abrt.pot index 35fef699..9a0aa9d7 100644 --- a/po/abrt.pot +++ b/po/abrt.pot @@ -169,7 +169,7 @@ msgid "" msgstr "" #. The response might take more than 1 char in non-latin scripts. -#: ../src/cli/report.c:394 ../src/plugins/abrt-action-install-debuginfo.py:83 +#: ../src/cli/report.c:394 ../src/plugins/abrt-action-install-debuginfo:83 msgid "y" msgstr "" @@ -731,42 +731,42 @@ msgstr "" msgid "Backtrace is generated and saved, %u bytes" msgstr "" -#: ../src/plugins/abrt-action-install-debuginfo.py:85 +#: ../src/plugins/abrt-action-install-debuginfo:85 msgid "n" msgstr "" -#: ../src/plugins/abrt-action-install-debuginfo.py:100 +#: ../src/plugins/abrt-action-install-debuginfo:100 #, python-format msgid "Extracting cpio from %s" msgstr "" -#: ../src/plugins/abrt-action-install-debuginfo.py:105 +#: ../src/plugins/abrt-action-install-debuginfo:105 #, python-format msgid "Can't write to '%s': %s" msgstr "" -#: ../src/plugins/abrt-action-install-debuginfo.py:119 +#: ../src/plugins/abrt-action-install-debuginfo:119 #, python-format msgid "Can't extract package '%s'" msgstr "" -#: ../src/plugins/abrt-action-install-debuginfo.py:127 +#: ../src/plugins/abrt-action-install-debuginfo:127 #, python-format msgid "Caching files from %s made from %s" msgstr "" -#: ../src/plugins/abrt-action-install-debuginfo.py:137 +#: ../src/plugins/abrt-action-install-debuginfo:137 #, python-format msgid "Can't extract files from '%s'" msgstr "" -#: ../src/plugins/abrt-action-install-debuginfo.py:161 -#: ../src/plugins/abrt-action-install-debuginfo.py:171 +#: ../src/plugins/abrt-action-install-debuginfo:161 +#: ../src/plugins/abrt-action-install-debuginfo:171 #, python-format msgid "Downloading (%i of %i) %s: %3u%%" msgstr "" -#: ../src/plugins/abrt-action-install-debuginfo.py:196 +#: ../src/plugins/abrt-action-install-debuginfo:196 #, python-format msgid "Error initializing yum (YumBase.doConfigSetup): '%s'" msgstr "" @@ -775,69 +775,69 @@ msgstr "" #. Looks like this is the moment when yum talks to remote servers, #. which takes time (sometimes minutes), let user know why #. we have "paused": -#: ../src/plugins/abrt-action-install-debuginfo.py:239 +#: ../src/plugins/abrt-action-install-debuginfo:239 msgid "Looking for needed packages in repositories" msgstr "" -#: ../src/plugins/abrt-action-install-debuginfo.py:243 +#: ../src/plugins/abrt-action-install-debuginfo:243 #, python-format msgid "Error retrieving metadata: '%s'" msgstr "" -#: ../src/plugins/abrt-action-install-debuginfo.py:253 +#: ../src/plugins/abrt-action-install-debuginfo:253 #, python-format msgid "Error retrieving filelists: '%s'" msgstr "" -#: ../src/plugins/abrt-action-install-debuginfo.py:286 +#: ../src/plugins/abrt-action-install-debuginfo:286 #, python-format msgid "Can't find packages for %u debuginfo files" msgstr "" -#: ../src/plugins/abrt-action-install-debuginfo.py:288 +#: ../src/plugins/abrt-action-install-debuginfo:288 #, python-format msgid "Packages to download: %u" msgstr "" -#: ../src/plugins/abrt-action-install-debuginfo.py:289 +#: ../src/plugins/abrt-action-install-debuginfo:289 #, python-format msgid "Downloading %.2fMb, installed size: %.2fMb" msgstr "" -#: ../src/plugins/abrt-action-install-debuginfo.py:297 +#: ../src/plugins/abrt-action-install-debuginfo:297 msgid "Is this ok? [y/N] " msgstr "" -#: ../src/plugins/abrt-action-install-debuginfo.py:314 +#: ../src/plugins/abrt-action-install-debuginfo:314 #, python-format msgid "Downloading package %s failed" msgstr "" #. recursively delete the temp dir on failure -#: ../src/plugins/abrt-action-install-debuginfo.py:325 +#: ../src/plugins/abrt-action-install-debuginfo:325 msgid "Unpacking failed, aborting download..." msgstr "" -#: ../src/plugins/abrt-action-install-debuginfo.py:332 +#: ../src/plugins/abrt-action-install-debuginfo:332 #, python-format msgid "All downloaded packages have been extracted, removing %s" msgstr "" -#: ../src/plugins/abrt-action-install-debuginfo.py:337 +#: ../src/plugins/abrt-action-install-debuginfo:337 #, python-format msgid "Can't remove %s, probably contains an error log" msgstr "" -#: ../src/plugins/abrt-action-install-debuginfo.py:371 +#: ../src/plugins/abrt-action-install-debuginfo:371 #, python-format msgid "Can't remove '%s': %s" msgstr "" -#: ../src/plugins/abrt-action-install-debuginfo.py:379 +#: ../src/plugins/abrt-action-install-debuginfo:379 msgid "Exiting on user command" msgstr "" -#: ../src/plugins/abrt-action-install-debuginfo.py:411 +#: ../src/plugins/abrt-action-install-debuginfo:411 #, python-format msgid "" "Usage: %s [-vy] [--ids=BUILD_IDS_FILE]\n" @@ -855,22 +855,22 @@ msgid "" " --size_mb Default: 4096\n" msgstr "" -#: ../src/plugins/abrt-action-install-debuginfo.py:466 +#: ../src/plugins/abrt-action-install-debuginfo:466 #, python-format msgid "Can't open %s: %s" msgstr "" -#: ../src/plugins/abrt-action-install-debuginfo.py:496 +#: ../src/plugins/abrt-action-install-debuginfo:496 #, python-format msgid "Coredump references %u debuginfo files, %u of them are not installed" msgstr "" -#: ../src/plugins/abrt-action-install-debuginfo.py:507 +#: ../src/plugins/abrt-action-install-debuginfo:507 #, python-format msgid "Missing debuginfo file: %s" msgstr "" -#: ../src/plugins/abrt-action-install-debuginfo.py:510 +#: ../src/plugins/abrt-action-install-debuginfo:510 #, python-format msgid "All %u debuginfo files are available" msgstr "" diff --git a/src/cli/Makefile.am b/src/cli/Makefile.am index bc02236e..2157445e 100644 --- a/src/cli/Makefile.am +++ b/src/cli/Makefile.am @@ -58,7 +58,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 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 |