aboutsummaryrefslogtreecommitdiff
path: root/paludis/environments/paludis/output_managers
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-01-02 22:24:38 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-01-02 22:24:38 +0000
commit09fd9de589f9b5edbaa23cc242d28ebc2ae62531 (patch)
tree1551c3a76961847c37a11a7d4c8654efaba7553e /paludis/environments/paludis/output_managers
parentd47ccc4a0abc3f87339fdb7d24bcb4b854fdc647 (diff)
downloadpaludis-09fd9de589f9b5edbaa23cc242d28ebc2ae62531.tar.gz
paludis-09fd9de589f9b5edbaa23cc242d28ebc2ae62531.tar.xz
Cleaner output managers
Diffstat (limited to 'paludis/environments/paludis/output_managers')
-rw-r--r--paludis/environments/paludis/output_managers/Makefile.am35
-rw-r--r--paludis/environments/paludis/output_managers/keep_messages.part.conf10
-rw-r--r--paludis/environments/paludis/output_managers/keep_stdout_as_messages.part.conf10
-rw-r--r--paludis/environments/paludis/output_managers/logged.conf6
-rw-r--r--paludis/environments/paludis/output_managers/logged_only.part.conf11
-rw-r--r--paludis/environments/paludis/output_managers/quiet.conf6
-rw-r--r--paludis/environments/paludis/output_managers/show_messages.part.conf5
-rw-r--r--paludis/environments/paludis/output_managers/standard.conf4
-rw-r--r--paludis/environments/paludis/output_managers/standard_on_failure.conf6
9 files changed, 0 insertions, 93 deletions
diff --git a/paludis/environments/paludis/output_managers/Makefile.am b/paludis/environments/paludis/output_managers/Makefile.am
deleted file mode 100644
index fa920bde9..000000000
--- a/paludis/environments/paludis/output_managers/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-SUBDIRS = .
-CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda *.loT *.epicfail .keep
-BUILT_SOURCES =
-MAINTAINERCLEANFILES = Makefile.in
-AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@ @PALUDIS_CXXFLAGS_VISIBILITY@
-DEFS= \
- -DSYSCONFDIR=\"$(sysconfdir)\" \
- -DLIBEXECDIR=\"$(libexecdir)\" \
- -DDATADIR=\"$(datadir)\" \
- -DLIBDIR=\"$(libdir)\"
-
-AUTOMAKE_OPTIONS = parallel-tests
-
-shareenvpaludisdir = $(datarootdir)/paludis/environments/paludis/output_managers
-
-dist_shareenvpaludis_DATA = \
- logged.conf \
- quiet.conf \
- standard.conf \
- standard_on_failure.conf \
- keep_messages.part.conf \
- keep_stdout_as_messages.part.conf \
- logged_only.part.conf \
- show_messages.part.conf
-
-logdir = @HACKED_LOG_DIR@
-
-log_DATA = .keep
-
-.keep :
- touch $@
-
-built-sources : $(BUILT_SOURCES)
- for s in `echo $(SUBDIRS) | tr -d .` ; do $(MAKE) -C $$s built-sources || exit 1 ; done
-
diff --git a/paludis/environments/paludis/output_managers/keep_messages.part.conf b/paludis/environments/paludis/output_managers/keep_messages.part.conf
deleted file mode 100644
index 5cc0f7b4e..000000000
--- a/paludis/environments/paludis/output_managers/keep_messages.part.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-# Keep message logs, ignore stdout / stderr. Not directly usable.
-
-handler = messages_to_stdout
-child = keep_stdout_as_messages.part
-format_debug =
-format_info = --- %{message}
-format_warn = *** %{message}
-format_error = !!! %{message}
-format_log = +++ %{message}
-
diff --git a/paludis/environments/paludis/output_managers/keep_stdout_as_messages.part.conf b/paludis/environments/paludis/output_managers/keep_stdout_as_messages.part.conf
deleted file mode 100644
index 112293fe5..000000000
--- a/paludis/environments/paludis/output_managers/keep_stdout_as_messages.part.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-# Keep message logs. For use by keep_messages.part; do not use directly.
-
-handler = file
-stdout = ${root}/var/log/paludis/%{time}-%{action}-%{full_name}.messages
-stderr = ${stdout}
-keep_on_success = true
-keep_on_empty = false
-summary_output_manager = standard
-summary_output_stdout_message = Messages log: ${stdout}
-
diff --git a/paludis/environments/paludis/output_managers/logged.conf b/paludis/environments/paludis/output_managers/logged.conf
deleted file mode 100644
index 1e40328dd..000000000
--- a/paludis/environments/paludis/output_managers/logged.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# Output to stdout / stderr, keep logs of messages and keep output logs on
-# failure.
-
-handler = tee
-children = standard logged_only.part keep_messages.part
-
diff --git a/paludis/environments/paludis/output_managers/logged_only.part.conf b/paludis/environments/paludis/output_managers/logged_only.part.conf
deleted file mode 100644
index 8b0d2b6a4..000000000
--- a/paludis/environments/paludis/output_managers/logged_only.part.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-# Keep logs of output only, and discard on success. Used by logged and quiet;
-# not directly usable.
-#
-handler = file
-stdout = ${root}/var/log/paludis/%{time}-%{action}-%{full_name}.out
-stderr = ${stdout}
-keep_on_success = false
-keep_on_empty = true
-summary_output_manager = standard
-summary_output_stdout_message = Output log: ${stdout}
-
diff --git a/paludis/environments/paludis/output_managers/quiet.conf b/paludis/environments/paludis/output_managers/quiet.conf
deleted file mode 100644
index 980db2979..000000000
--- a/paludis/environments/paludis/output_managers/quiet.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# Messages only to stdout / stderr, keep logs of messages and keep output logs
-# on failure.
-
-handler = tee
-children = logged_only.part show_messages.part keep_messages.part
-
diff --git a/paludis/environments/paludis/output_managers/show_messages.part.conf b/paludis/environments/paludis/output_managers/show_messages.part.conf
deleted file mode 100644
index 39cfa2c51..000000000
--- a/paludis/environments/paludis/output_managers/show_messages.part.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# Show messages only. Not usable on its own.
-
-handler = messages_to_stdout
-child = standard
-
diff --git a/paludis/environments/paludis/output_managers/standard.conf b/paludis/environments/paludis/output_managers/standard.conf
deleted file mode 100644
index 7b910c7db..000000000
--- a/paludis/environments/paludis/output_managers/standard.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# This output manager sends stdout output to stdout and stderr output to
-# stderr. There is no special handling for messages.
-
-handler = standard
diff --git a/paludis/environments/paludis/output_managers/standard_on_failure.conf b/paludis/environments/paludis/output_managers/standard_on_failure.conf
deleted file mode 100644
index f6dd6e04b..000000000
--- a/paludis/environments/paludis/output_managers/standard_on_failure.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# This handler saves up output (in memory, so don't use it for big processes)
-# and displays it to standard only if an error occurs.
-
-handler = forward_on_failure
-child = standard
-