aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-02-12 18:18:38 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-02-12 18:18:38 +0000
commitcaf15ee458dfe5c76cb36f20523597f88b38be70 (patch)
treeaf70171539548712d7e52babc5ace7591a6d7ec5
parent23c22d5df8d5d47111d9c8e1e43e787f6a534b65 (diff)
downloadpaludis-caf15ee458dfe5c76cb36f20523597f88b38be70.tar.gz
paludis-caf15ee458dfe5c76cb36f20523597f88b38be70.tar.xz
Better default output manager
-rw-r--r--hooks/Makefile.am.m42
-rw-r--r--paludis/Makefile.am.m42
-rw-r--r--paludis/environments/paludis/Makefile.am5
-rw-r--r--paludis/environments/paludis/default_output.conf2
-rw-r--r--paludis/environments/paludis/output_managers/Makefile.am13
-rw-r--r--paludis/environments/paludis/output_managers/logged.conf5
-rw-r--r--paludis/environments/paludis/output_managers/logged_only.conf7
-rw-r--r--paludis/environments/paludis/tests_output.conf1
-rw-r--r--paludis/install_task.cc49
-rw-r--r--paludis/install_task.hh7
-rw-r--r--paludis/repositories/accounts/Makefile.am2
-rw-r--r--paludis/repositories/cran/Makefile.am2
-rw-r--r--paludis/repositories/e/Makefile.am2
-rw-r--r--paludis/repositories/e/ebuild/0/Makefile.am2
-rw-r--r--paludis/repositories/e/ebuild/1/Makefile.am2
-rw-r--r--paludis/repositories/e/ebuild/2/Makefile.am2
-rw-r--r--paludis/repositories/e/ebuild/Makefile.am2
-rw-r--r--paludis/repositories/e/ebuild/exheres-0/Makefile.am2
-rw-r--r--paludis/repositories/e/ebuild/kdebuild-1/Makefile.am2
-rw-r--r--paludis/repositories/e/ebuild/paludis-1/Makefile.am2
-rw-r--r--paludis/repositories/e/ebuild/pbin-1/Makefile.am2
-rw-r--r--paludis/repositories/e/qa/Makefile.am2
-rw-r--r--paludis/repositories/fake/Makefile.am2
-rw-r--r--paludis/repositories/gems/Makefile.am2
-rw-r--r--paludis/repositories/unavailable/Makefile.am2
-rw-r--r--paludis/repositories/unpackaged/Makefile.am2
-rw-r--r--paludis/repositories/unwritten/Makefile.am2
-rw-r--r--paludis/repositories/virtuals/Makefile.am2
-rw-r--r--python/Makefile.am2
-rw-r--r--ruby/Makefile.am2
-rw-r--r--ruby/demos/Makefile.am2
-rw-r--r--src/clients/accerso/Makefile.am2
-rw-r--r--src/clients/adjutrix/Makefile.am2
-rw-r--r--src/clients/appareo/Makefile.am2
-rw-r--r--src/clients/cave/Makefile.am2
-rw-r--r--src/clients/importare/Makefile.am2
-rw-r--r--src/clients/inquisitio/Makefile.am2
-rw-r--r--src/clients/instruo/Makefile.am2
-rw-r--r--src/clients/paludis/Makefile.am2
-rw-r--r--src/clients/reconcilio/Makefile.am2
-rw-r--r--src/output/console_install_task.cc42
-rw-r--r--src/output/console_install_task.hh4
42 files changed, 118 insertions, 81 deletions
diff --git a/hooks/Makefile.am.m4 b/hooks/Makefile.am.m4
index f992cff..9512812 100644
--- a/hooks/Makefile.am.m4
+++ b/hooks/Makefile.am.m4
@@ -301,7 +301,7 @@ TESTS_ENVIRONMENT = env \
PALUDIS_SKIP_CONFIG="yes" \
PALUDIS_REPOSITORY_SO_DIR="$(top_builddir)/paludis/repositories" \
PALUDIS_ENVIRONMENT_SO_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments`" \
- PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/default_output.conf`" \
+ PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/tests_output.conf`" \
PALUDIS_OUTPUT_MANAGERS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/output_managers/`" \
TOP_SRCDIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_srcdir)`" \
TOP_BUILDDIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)`" \
diff --git a/paludis/Makefile.am.m4 b/paludis/Makefile.am.m4
index 6df5ee3..a3100cd 100644
--- a/paludis/Makefile.am.m4
+++ b/paludis/Makefile.am.m4
@@ -200,7 +200,7 @@ TESTS_ENVIRONMENT = env \
PALUDIS_PC_SLOT=@PALUDIS_PC_SLOT@ \
PYTHONPATH="$(top_builddir)/python/" \
PALUDIS_PYTHON_DIR="$(top_srcdir)/python/" \
- PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/default_output.conf`" \
+ PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/tests_output.conf`" \
PALUDIS_OUTPUT_MANAGERS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/output_managers/`" \
LD_LIBRARY_PATH="`echo $$LD_LIBRARY_PATH: | sed -e 's,^:,,'`` \
$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/.libs/ \
diff --git a/paludis/environments/paludis/Makefile.am b/paludis/environments/paludis/Makefile.am
index 0798a66..5aa5cd9 100644
--- a/paludis/environments/paludis/Makefile.am
+++ b/paludis/environments/paludis/Makefile.am
@@ -31,7 +31,8 @@ libpaludispaludisenvironment_@PALUDIS_PC_SLOT@_la_LDFLAGS = -version-info @VERSI
shareenvpaludisdir = $(sharedir)/paludis/environments/paludis/
dist_shareenvpaludis_DATA = \
- default_output.conf
+ default_output.conf \
+ tests_output.conf
if ! MONOLITHIC
@@ -91,7 +92,7 @@ TESTS_ENVIRONMENT = env \
PALUDIS_REPOSITORY_SO_DIR="$(top_builddir)/paludis/repositories" \
PALUDIS_NO_CHOWN="yes" \
PALUDIS_TESTS_KEEP_STDERR="yes" \
- PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/default_output.conf`" \
+ PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/tests_output.conf`" \
PALUDIS_OUTPUT_MANAGERS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/output_managers/`" \
LD_LIBRARY_PATH="`echo $$LD_LIBRARY_PATH: | sed -e 's,^:,,'`` \
$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/e/`:` \
diff --git a/paludis/environments/paludis/default_output.conf b/paludis/environments/paludis/default_output.conf
index 8f4e280..9c8cf06 100644
--- a/paludis/environments/paludis/default_output.conf
+++ b/paludis/environments/paludis/default_output.conf
@@ -1 +1 @@
-type = * : standard
+type = * : logged
diff --git a/paludis/environments/paludis/output_managers/Makefile.am b/paludis/environments/paludis/output_managers/Makefile.am
index 07df6b4..ed7a080 100644
--- a/paludis/environments/paludis/output_managers/Makefile.am
+++ b/paludis/environments/paludis/output_managers/Makefile.am
@@ -1,5 +1,5 @@
SUBDIRS = .
-CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda *.loT *.epicfail
+CLEANFILES = *~ gmon.out *.gcov *.gcno *.gcda *.loT *.epicfail .keep
BUILT_SOURCES =
MAINTAINERCLEANFILES = Makefile.in
AM_CXXFLAGS = -I$(top_srcdir) @PALUDIS_CXXFLAGS@ @PALUDIS_CXXFLAGS_VISIBILITY@
@@ -12,7 +12,16 @@ DEFS= \
shareenvpaludisdir = $(sharedir)/paludis/environments/paludis/output_managers
dist_shareenvpaludis_DATA = \
- standard.conf
+ standard.conf \
+ logged.conf \
+ logged_only.conf
+
+logdir = /var/log/paludis
+
+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/logged.conf b/paludis/environments/paludis/output_managers/logged.conf
new file mode 100644
index 0000000..338d31b
--- /dev/null
+++ b/paludis/environments/paludis/output_managers/logged.conf
@@ -0,0 +1,5 @@
+# Sends output to both standard and logged_only.
+
+handler = tee
+children = standard logged_only
+
diff --git a/paludis/environments/paludis/output_managers/logged_only.conf b/paludis/environments/paludis/output_managers/logged_only.conf
new file mode 100644
index 0000000..5884ea3
--- /dev/null
+++ b/paludis/environments/paludis/output_managers/logged_only.conf
@@ -0,0 +1,7 @@
+# This output handler keeps logs in /var/log/paludis/, but removes them on
+# success.
+
+handler = file
+stdout = /var/log/paludis/%{time}-%{action}-%{id}.out
+stderr = ${stdout}
+keep_on_success = false
diff --git a/paludis/environments/paludis/tests_output.conf b/paludis/environments/paludis/tests_output.conf
new file mode 100644
index 0000000..8f4e280
--- /dev/null
+++ b/paludis/environments/paludis/tests_output.conf
@@ -0,0 +1 @@
+type = * : standard
diff --git a/paludis/install_task.cc b/paludis/install_task.cc
index 170c5d8..bd48140 100644
--- a/paludis/install_task.cc
+++ b/paludis/install_task.cc
@@ -53,6 +53,7 @@
#include <paludis/create_output_manager_info.hh>
#include <paludis/output_manager_from_environment.hh>
#include <paludis/output_manager.hh>
+#include <paludis/standard_output_manager.hh>
#include <tr1/functional>
#include <sstream>
#include <functional>
@@ -725,7 +726,8 @@ InstallTask::_pretend()
}
void
-InstallTask::_one(const DepList::Iterator dep, const int x, const int y, const int s, const int f, const bool is_first, const bool is_last)
+InstallTask::_one(const DepList::Iterator dep, const int x, const int y, const int s, const int f, const bool is_first, const bool is_last,
+ std::tr1::shared_ptr<OutputManagerFromEnvironment> & output_manager_holder)
{
std::string cpvr(stringify(*dep->package_id()));
@@ -765,21 +767,22 @@ InstallTask::_one(const DepList::Iterator dep, const int x, const int y, const i
SupportsActionTest<FetchAction> test_fetch;
if (dep->package_id()->supports_action(test_fetch))
{
- OutputManagerFromEnvironment output_manager_holder(_imp->env, dep->package_id(), oe_exclusive);
- FetchActionOptions fetch_options(make_fetch_action_options(*dep, output_manager_holder));
+ output_manager_holder.reset(new OutputManagerFromEnvironment(_imp->env, dep->package_id(), oe_exclusive));
+ FetchActionOptions fetch_options(make_fetch_action_options(*dep, *output_manager_holder));
FetchAction fetch_action(fetch_options);
dep->package_id()->perform_action(fetch_action);
- if (output_manager_holder.output_manager_if_constructed())
- output_manager_holder.output_manager_if_constructed()->succeeded();
+ if (output_manager_holder->output_manager_if_constructed())
+ output_manager_holder->output_manager_if_constructed()->succeeded();
+ output_manager_holder.reset();
}
if (! _imp->fetch_only)
{
- OutputManagerFromEnvironment output_manager_holder(_imp->env, dep->package_id(), oe_exclusive);
+ output_manager_holder.reset(new OutputManagerFromEnvironment(_imp->env, dep->package_id(), oe_exclusive));
InstallActionOptions install_options(make_named_values<InstallActionOptions>(
value_for<n::destination>(dep->destination()),
- value_for<n::make_output_manager>(std::tr1::ref(output_manager_holder)),
+ value_for<n::make_output_manager>(std::tr1::ref(*output_manager_holder)),
value_for<n::used_this_for_config_protect>(std::tr1::bind(
&Implementation<InstallTask>::assign_config_protect,
_imp.get(), std::tr1::placeholders::_1)),
@@ -799,18 +802,20 @@ InstallTask::_one(const DepList::Iterator dep, const int x, const int y, const i
apply_phases = true;
}
if (apply_phases)
- install_options.want_phase() = std::tr1::bind(&want_phase_function, this, std::tr1::ref(output_manager_holder),
+ install_options.want_phase() = std::tr1::bind(&want_phase_function, this, std::tr1::ref(*output_manager_holder),
std::tr1::cref(_imp->abort_at_phases), std::tr1::cref(_imp->skip_phases), std::tr1::cref(_imp->skip_until_phases),
std::tr1::ref(done_any), std::tr1::placeholders::_1);
else
- install_options.want_phase() = std::tr1::bind(&want_all_phases_function, this, std::tr1::ref(output_manager_holder),
+ install_options.want_phase() = std::tr1::bind(&want_all_phases_function, this, std::tr1::ref(*output_manager_holder),
std::tr1::ref(done_any), std::tr1::placeholders::_1);
InstallAction install_action(install_options);
dep->package_id()->perform_action(install_action);
- if (output_manager_holder.output_manager_if_constructed())
- output_manager_holder.output_manager_if_constructed()->succeeded();
+ if (output_manager_holder->output_manager_if_constructed())
+ output_manager_holder->output_manager_if_constructed()->succeeded();
+
+ output_manager_holder.reset();
}
}
catch (const InstallActionError & e)
@@ -894,15 +899,16 @@ InstallTask::_one(const DepList::Iterator dep, const int x, const int y, const i
try
{
- OutputManagerFromEnvironment output_manager_holder(_imp->env, dep->package_id(), oe_exclusive);
+ output_manager_holder.reset(new OutputManagerFromEnvironment(_imp->env, dep->package_id(), oe_exclusive));
UninstallAction uninstall_action(
make_named_values<UninstallActionOptions>(
value_for<n::config_protect>(_imp->config_protect),
- value_for<n::make_output_manager>(std::tr1::ref(output_manager_holder))
+ value_for<n::make_output_manager>(std::tr1::ref(*output_manager_holder))
));
(*c)->perform_action(uninstall_action);
- if (output_manager_holder.output_manager_if_constructed())
- output_manager_holder.output_manager_if_constructed()->succeeded();
+ if (output_manager_holder->output_manager_if_constructed())
+ output_manager_holder->output_manager_if_constructed()->succeeded();
+ output_manager_holder.reset();
}
catch (const UninstallActionError & e)
{
@@ -1039,20 +1045,27 @@ InstallTask::_main_actions()
}
}
+ std::tr1::shared_ptr<OutputManagerFromEnvironment> output_manager_holder;
try
{
- _one(dep, x, y, s, f, is_first, is_last);
+ _one(dep, x, y, s, f, is_first, is_last, output_manager_holder);
}
catch (const InstallActionError & e)
{
dep->handled().reset(new DepListEntryHandledFailed);
- on_install_action_error(e);
+ if (output_manager_holder && output_manager_holder->output_manager_if_constructed())
+ on_install_action_error(output_manager_holder->output_manager_if_constructed(), e);
+ else
+ on_install_action_error(make_shared_ptr(new StandardOutputManager), e);
++f;
}
catch (const FetchActionError & e)
{
dep->handled().reset(new DepListEntryHandledFailed);
- on_fetch_action_error(e);
+ if (output_manager_holder && output_manager_holder->output_manager_if_constructed())
+ on_fetch_action_error(output_manager_holder->output_manager_if_constructed(), e);
+ else
+ on_fetch_action_error(make_shared_ptr(new StandardOutputManager), e);
++f;
}
diff --git a/paludis/install_task.hh b/paludis/install_task.hh
index 449d9b2..e733324 100644
--- a/paludis/install_task.hh
+++ b/paludis/install_task.hh
@@ -63,7 +63,8 @@ namespace paludis
void _display_task_list();
bool _pretend();
void _main_actions();
- void _one(const DepList::Iterator, const int, const int, const int, const int, const bool is_first, const bool is_last);
+ void _one(const DepList::Iterator, const int, const int, const int, const int, const bool is_first, const bool is_last,
+ std::tr1::shared_ptr<OutputManagerFromEnvironment> &);
void _display_failure_summary();
void _add_target(const std::string &);
@@ -207,8 +208,8 @@ namespace paludis
virtual void on_had_both_package_and_set_targets_error(const HadBothPackageAndSetTargets &) = 0;
virtual void on_multiple_set_targets_specified(const MultipleSetTargetsSpecified &) = 0;
- virtual void on_install_action_error(const InstallActionError &) = 0;
- virtual void on_fetch_action_error(const FetchActionError &) = 0;
+ virtual void on_install_action_error(const std::tr1::shared_ptr<OutputManager> &, const InstallActionError &) = 0;
+ virtual void on_fetch_action_error(const std::tr1::shared_ptr<OutputManager> &, const FetchActionError &) = 0;
virtual void on_phase_skip(const std::tr1::shared_ptr<OutputManager> & output_manager, const std::string & phase) = 0;
virtual void on_phase_abort(const std::tr1::shared_ptr<OutputManager> & output_manager, const std::string & phase) = 0;
diff --git a/paludis/repositories/accounts/Makefile.am b/paludis/repositories/accounts/Makefile.am
index 206bac0..0ab2044 100644
--- a/paludis/repositories/accounts/Makefile.am
+++ b/paludis/repositories/accounts/Makefile.am
@@ -77,7 +77,7 @@ TESTS_ENVIRONMENT = env \
TEST_SCRIPT_DIR="$(srcdir)/" \
PALUDIS_REPOSITORY_SO_DIR="$(top_builddir)/paludis/repositories" \
PALUDIS_NO_CHOWN="yes" \
- PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/default_output.conf`" \
+ PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/tests_output.conf`" \
PALUDIS_OUTPUT_MANAGERS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/output_managers/`" \
bash $(top_srcdir)/test/run_test.sh
diff --git a/paludis/repositories/cran/Makefile.am b/paludis/repositories/cran/Makefile.am
index 3b86eb6..0e0447b 100644
--- a/paludis/repositories/cran/Makefile.am
+++ b/paludis/repositories/cran/Makefile.am
@@ -128,7 +128,7 @@ TESTS_ENVIRONMENT = env \
PALUDIS_DISTRIBUTIONS_DIR="$(top_srcdir)/paludis/distributions/" \
PALUDIS_DISTRIBUTION="gentoo" \
PALUDIS_OPTIONS="" \
- PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/default_output.conf`" \
+ PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/tests_output.conf`" \
PALUDIS_OUTPUT_MANAGERS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/output_managers/`" \
TEST_SCRIPT_DIR="$(srcdir)/" \
PALUDIS_REPOSITORY_SO_DIR="$(top_builddir)/paludis/repositories" \
diff --git a/paludis/repositories/e/Makefile.am b/paludis/repositories/e/Makefile.am
index 7d49b80..efa0303 100644
--- a/paludis/repositories/e/Makefile.am
+++ b/paludis/repositories/e/Makefile.am
@@ -426,7 +426,7 @@ TESTS_ENVIRONMENT = env \
PALUDIS_TESTS_KEEP_STDERR="yes" \
PALDUIS_TMPDIR="`pwd`" \
PALUDIS_BYPASS_USERPRIV_CHECKS="yes" \
- PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/default_output.conf`" \
+ PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/tests_output.conf`" \
PALUDIS_OUTPUT_MANAGERS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/output_managers/`" \
LD_LIBRARY_PATH="`echo $$LD_LIBRARY_PATH: | sed -e 's,^:,,'`` \
$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories/e/`:` \
diff --git a/paludis/repositories/e/ebuild/0/Makefile.am b/paludis/repositories/e/ebuild/0/Makefile.am
index 449096c..65e5a90 100644
--- a/paludis/repositories/e/ebuild/0/Makefile.am
+++ b/paludis/repositories/e/ebuild/0/Makefile.am
@@ -49,7 +49,7 @@ TESTS_ENVIRONMENT = env \
PALUDIS_DISTRIBUTIONS_DIR="$(top_srcdir)/paludis/distributions/" \
PALUDIS_EBUILD_LOG_LEVEL="warning" \
PALUDIS_OPTIONS="" \
- PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/default_output.conf`" \
+ PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/tests_output.conf`" \
PALUDIS_OUTPUT_MANAGERS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/output_managers/`" \
TOP_BUILD_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/`" \
TEST_SCRIPT_DIR="$(srcdir)/" \
diff --git a/paludis/repositories/e/ebuild/1/Makefile.am b/paludis/repositories/e/ebuild/1/Makefile.am
index 84f92d2..a12fc77 100644
--- a/paludis/repositories/e/ebuild/1/Makefile.am
+++ b/paludis/repositories/e/ebuild/1/Makefile.am
@@ -17,7 +17,7 @@ TESTS_ENVIRONMENT = env \
PALUDIS_DISTRIBUTION="gentoo" \
PALUDIS_OPTIONS="" \
PALUDIS_EBUILD_LOG_LEVEL="warning" \
- PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/default_output.conf`" \
+ PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/tests_output.conf`" \
PALUDIS_OUTPUT_MANAGERS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/output_managers/`" \
TOP_BUILD_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/`" \
TEST_SCRIPT_DIR="$(srcdir)/" \
diff --git a/paludis/repositories/e/ebuild/2/Makefile.am b/paludis/repositories/e/ebuild/2/Makefile.am
index 99c2fec..2afb0a9 100644
--- a/paludis/repositories/e/ebuild/2/Makefile.am
+++ b/paludis/repositories/e/ebuild/2/Makefile.am
@@ -24,7 +24,7 @@ TESTS_ENVIRONMENT = env \
PALUDIS_DISTRIBUTION="gentoo" \
PALUDIS_OPTIONS="" \
PALUDIS_EBUILD_LOG_LEVEL="warning" \
- PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/default_output.conf`" \
+ PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/tests_output.conf`" \
PALUDIS_OUTPUT_MANAGERS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/output_managers/`" \
TOP_BUILD_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/`" \
TEST_SCRIPT_DIR="$(srcdir)/" \
diff --git a/paludis/repositories/e/ebuild/Makefile.am b/paludis/repositories/e/ebuild/Makefile.am
index 2a5193e..b6ed8c8 100644
--- a/paludis/repositories/e/ebuild/Makefile.am
+++ b/paludis/repositories/e/ebuild/Makefile.am
@@ -31,7 +31,7 @@ TESTS_ENVIRONMENT = env \
PALUDIS_DISTRIBUTION="gentoo" \
PALUDIS_OPTIONS="" \
PALUDIS_EBUILD_LOG_LEVEL="warning" \
- PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/default_output.conf`" \
+ PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/tests_output.conf`" \
PALUDIS_OUTPUT_MANAGERS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/output_managers/`" \
TOP_BUILD_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/`" \
TEST_SCRIPT_DIR="$(srcdir)/" \
diff --git a/paludis/repositories/e/ebuild/exheres-0/Makefile.am b/paludis/repositories/e/ebuild/exheres-0/Makefile.am
index 903b6db..45c189c 100644
--- a/paludis/repositories/e/ebuild/exheres-0/Makefile.am
+++ b/paludis/repositories/e/ebuild/exheres-0/Makefile.am
@@ -53,7 +53,7 @@ TESTS_ENVIRONMENT = env \
PALUDIS_OPTIONS="" \
PALUDIS_EBUILD_LOG_LEVEL="warning" \
PALUDIS_EBUILD_MODULE_SUFFIXES="exheres-0" \
- PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/default_output.conf`" \
+ PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/tests_output.conf`" \
PALUDIS_OUTPUT_MANAGERS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/output_managers/`" \
TOP_BUILD_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/`" \
TEST_SCRIPT_DIR="$(srcdir)/" \
diff --git a/paludis/repositories/e/ebuild/kdebuild-1/Makefile.am b/paludis/repositories/e/ebuild/kdebuild-1/Makefile.am
index 45020ad..87dfb0e 100644
--- a/paludis/repositories/e/ebuild/kdebuild-1/Makefile.am
+++ b/paludis/repositories/e/ebuild/kdebuild-1/Makefile.am
@@ -16,7 +16,7 @@ TESTS_ENVIRONMENT = env \
PALUDIS_DISTRIBUTION="gentoo" \
PALUDIS_OPTIONS="" \
PALUDIS_EBUILD_LOG_LEVEL="warning" \
- PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/default_output.conf`" \
+ PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/tests_output.conf`" \
PALUDIS_OUTPUT_MANAGERS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/output_managers/`" \
TOP_BUILD_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/`" \
TEST_SCRIPT_DIR="$(srcdir)/" \
diff --git a/paludis/repositories/e/ebuild/paludis-1/Makefile.am b/paludis/repositories/e/ebuild/paludis-1/Makefile.am
index 1a2c266..8c84306 100644
--- a/paludis/repositories/e/ebuild/paludis-1/Makefile.am
+++ b/paludis/repositories/e/ebuild/paludis-1/Makefile.am
@@ -16,7 +16,7 @@ TESTS_ENVIRONMENT = env \
PALUDIS_DISTRIBUTION="gentoo" \
PALUDIS_OPTIONS="" \
PALUDIS_EBUILD_LOG_LEVEL="warning" \
- PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/default_output.conf`" \
+ PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/tests_output.conf`" \
PALUDIS_OUTPUT_MANAGERS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/output_managers/`" \
TOP_BUILD_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/`" \
TEST_SCRIPT_DIR="$(srcdir)/" \
diff --git a/paludis/repositories/e/ebuild/pbin-1/Makefile.am b/paludis/repositories/e/ebuild/pbin-1/Makefile.am
index 88e0820..71e726b 100644
--- a/paludis/repositories/e/ebuild/pbin-1/Makefile.am
+++ b/paludis/repositories/e/ebuild/pbin-1/Makefile.am
@@ -16,7 +16,7 @@ TESTS_ENVIRONMENT = env \
PALUDIS_DISTRIBUTION="gentoo" \
PALUDIS_OPTIONS="" \
PALUDIS_EBUILD_LOG_LEVEL="warning" \
- PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/default_output.conf`" \
+ PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/tests_output.conf`" \
PALUDIS_OUTPUT_MANAGERS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/output_managers/`" \
TOP_BUILD_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/`" \
TEST_SCRIPT_DIR="$(srcdir)/" \
diff --git a/paludis/repositories/e/qa/Makefile.am b/paludis/repositories/e/qa/Makefile.am
index 7eeb8ab..5f23e87 100644
--- a/paludis/repositories/e/qa/Makefile.am
+++ b/paludis/repositories/e/qa/Makefile.am
@@ -138,7 +138,7 @@ TESTS_ENVIRONMENT = env \
PALUDIS_DISTRIBUTIONS_DIR="$(top_srcdir)/paludis/distributions/" \
PALUDIS_DISTRIBUTION="gentoo" \
PALUDIS_SKIP_CONFIG="yes" \
- PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/default_output.conf`" \
+ PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/tests_output.conf`" \
PALUDIS_OUTPUT_MANAGERS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/output_managers/`" \
TEST_SCRIPT_DIR="$(srcdir)/" \
PALUDIS_REPOSITORY_SO_DIR="$(top_builddir)/paludis/repositories" \
diff --git a/paludis/repositories/fake/Makefile.am b/paludis/repositories/fake/Makefile.am
index e0d7644..77d6c1b 100644
--- a/paludis/repositories/fake/Makefile.am
+++ b/paludis/repositories/fake/Makefile.am
@@ -16,7 +16,7 @@ TESTS_ENVIRONMENT = env \
PALUDIS_DISTRIBUTION="gentoo" \
PALUDIS_OPTIONS="" \
PALUDIS_SKIP_CONFIG="yes" \
- PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/default_output.conf`" \
+ PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/tests_output.conf`" \
PALUDIS_OUTPUT_MANAGERS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/output_managers/`" \
TEST_SCRIPT_DIR="$(srcdir)/" \
PALUDIS_REPOSITORY_SO_DIR="$(top_builddir)/paludis/repositories" \
diff --git a/paludis/repositories/gems/Makefile.am b/paludis/repositories/gems/Makefile.am
index ccda0d2..ea27f9b 100644
--- a/paludis/repositories/gems/Makefile.am
+++ b/paludis/repositories/gems/Makefile.am
@@ -124,7 +124,7 @@ TESTS_ENVIRONMENT = env \
PALUDIS_DISTRIBUTION="gentoo" \
PALUDIS_OPTIONS="" \
PALUDIS_SKIP_CONFIG="yes" \
- PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/default_output.conf`" \
+ PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/tests_output.conf`" \
PALUDIS_OUTPUT_MANAGERS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/output_managers/`" \
TEST_SCRIPT_DIR="$(srcdir)/" \
PALUDIS_REPOSITORY_SO_DIR="$(top_builddir)/paludis/repositories" \
diff --git a/paludis/repositories/unavailable/Makefile.am b/paludis/repositories/unavailable/Makefile.am
index 475de43..0775a29 100644
--- a/paludis/repositories/unavailable/Makefile.am
+++ b/paludis/repositories/unavailable/Makefile.am
@@ -71,7 +71,7 @@ TESTS_ENVIRONMENT = env \
PALUDIS_FETCHERS_DIR="$(top_srcdir)/paludis/fetchers/" \
PALUDIS_OPTIONS="" \
PALUDIS_SKIP_CONFIG="yes" \
- PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/default_output.conf`" \
+ PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/tests_output.conf`" \
PALUDIS_OUTPUT_MANAGERS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/output_managers/`" \
TEST_SCRIPT_DIR="$(srcdir)/" \
PALUDIS_REPOSITORY_SO_DIR="$(top_builddir)/paludis/repositories" \
diff --git a/paludis/repositories/unpackaged/Makefile.am b/paludis/repositories/unpackaged/Makefile.am
index fc9d1e5..42904db 100644
--- a/paludis/repositories/unpackaged/Makefile.am
+++ b/paludis/repositories/unpackaged/Makefile.am
@@ -110,7 +110,7 @@ TESTS_ENVIRONMENT = env \
PALUDIS_DISTRIBUTION="gentoo" \
PALUDIS_FETCHERS_DIR="$(top_srcdir)/paludis/fetchers/" \
PALUDIS_SKIP_CONFIG="yes" \
- PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/default_output.conf`" \
+ PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/tests_output.conf`" \
PALUDIS_OUTPUT_MANAGERS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/output_managers/`" \
TEST_SCRIPT_DIR="$(srcdir)/" \
PALUDIS_REPOSITORY_SO_DIR="$(top_builddir)/paludis/repositories" \
diff --git a/paludis/repositories/unwritten/Makefile.am b/paludis/repositories/unwritten/Makefile.am
index d880a90..1cf4e58 100644
--- a/paludis/repositories/unwritten/Makefile.am
+++ b/paludis/repositories/unwritten/Makefile.am
@@ -70,7 +70,7 @@ TESTS_ENVIRONMENT = env \
PALUDIS_FETCHERS_DIR="$(top_srcdir)/paludis/fetchers/" \
PALUDIS_OPTIONS="" \
PALUDIS_SKIP_CONFIG="yes" \
- PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/default_output.conf`" \
+ PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/tests_output.tests_output`" \
PALUDIS_OUTPUT_MANAGERS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/output_managers/`" \
TEST_SCRIPT_DIR="$(srcdir)/" \
PALUDIS_REPOSITORY_SO_DIR="$(top_builddir)/paludis/repositories" \
diff --git a/paludis/repositories/virtuals/Makefile.am b/paludis/repositories/virtuals/Makefile.am
index aa1c5de..fedd149 100644
--- a/paludis/repositories/virtuals/Makefile.am
+++ b/paludis/repositories/virtuals/Makefile.am
@@ -59,7 +59,7 @@ TESTS_ENVIRONMENT = env \
PALUDIS_DISTRIBUTION="gentoo" \
PALUDIS_OPTIONS="" \
PALUDIS_SKIP_CONFIG="yes" \
- PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/default_output.conf`" \
+ PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/tests_output.conf`" \
PALUDIS_OUTPUT_MANAGERS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/output_managers/`" \
TEST_SCRIPT_DIR="$(srcdir)/" \
PALUDIS_REPOSITORY_SO_DIR="$(top_builddir)/paludis/repositories" \
diff --git a/python/Makefile.am b/python/Makefile.am
index fa2a2ff..7434f57 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -130,7 +130,7 @@ TESTS_ENVIRONMENT = env \
PALUDIS_REPOSITORY_SO_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories`" \
PALUDIS_ENVIRONMENT_SO_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments`" \
PALUDIS_ENABLE_VIRTUALS_REPOSITORY="$(PALUDIS_ENABLE_VIRTUALS_REPOSITORY_VALUE)" \
- PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/default_output.conf`" \
+ PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/tests_output.conf`" \
PALUDIS_OUTPUT_MANAGERS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/output_managers/`" \
SYSCONFDIR="$(sysconfdir)" \
LD_LIBRARY_PATH="`echo $$LD_LIBRARY_PATH: | sed -e 's,^:,,'`` \
diff --git a/ruby/Makefile.am b/ruby/Makefile.am
index 5c51f67..1b28e81 100644
--- a/ruby/Makefile.am
+++ b/ruby/Makefile.am
@@ -112,7 +112,7 @@ TESTS_ENVIRONMENT = env \
PALUDIS_REPOSITORY_SO_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories`" \
PALUDIS_ENVIRONMENT_SO_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments`" \
PALUDIS_ENABLE_VIRTUALS_REPOSITORY="$(PALUDIS_ENABLE_VIRTUALS_REPOSITORY_VALUE)" \
- PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/default_output.conf`" \
+ PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/tests_output.conf`" \
PALUDIS_OUTPUT_MANAGERS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/output_managers/`" \
SYSCONFDIR="$(sysconfdir)" \
LD_LIBRARY_PATH=`echo "\`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/.libs\`: \
diff --git a/ruby/demos/Makefile.am b/ruby/demos/Makefile.am
index 158b81b..180b415 100644
--- a/ruby/demos/Makefile.am
+++ b/ruby/demos/Makefile.am
@@ -33,7 +33,7 @@ TESTS_ENVIRONMENT = env \
PALUDIS_DISTRIBUTION="gentoo" \
PALUDIS_OPTIONS="" \
PALUDIS_REPOSITORY_SO_DIR="`$(top_srcdir)/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories`" \
- PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/default_output.conf`" \
+ PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/tests_output.conf`" \
PALUDIS_OUTPUT_MANAGERS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/output_managers/`" \
SYSCONFDIR="$(sysconfdir)" \
LD_LIBRARY_PATH="`$(top_srcdir)/ebuild/utils/canonicalise $(top_builddir)/paludis/.libs`" \
diff --git a/src/clients/accerso/Makefile.am b/src/clients/accerso/Makefile.am
index 635fd41..aedeacf 100644
--- a/src/clients/accerso/Makefile.am
+++ b/src/clients/accerso/Makefile.am
@@ -56,7 +56,7 @@ TESTS_ENVIRONMENT = env \
PALUDIS_NO_CHOWN="yupyup" \
PALUDIS_REDUCED_USERNAME="`id -un`" \
PALUDIS_OUTPUTWRAPPER_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/`" \
- PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/default_output.conf`" \
+ PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/tests_output.conf`" \
PALUDIS_OUTPUT_MANAGERS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/output_managers/`" \
TEST_OUTPUT_WRAPPER="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/outputwrapper`" \
SYSCONFDIR="$(sysconfdir)" \
diff --git a/src/clients/adjutrix/Makefile.am b/src/clients/adjutrix/Makefile.am
index d141931..ca88f5a 100644
--- a/src/clients/adjutrix/Makefile.am
+++ b/src/clients/adjutrix/Makefile.am
@@ -66,7 +66,7 @@ TESTS_ENVIRONMENT = env \
PALUDIS_DISTRIBUTION="gentoo" \
PALUDIS_OPTIONS="" \
PALUDIS_REPOSITORY_SO_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories`" \
- PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/default_output.conf`" \
+ PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/tests_output.conf`" \
PALUDIS_OUTPUT_MANAGERS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/output_managers/`" \
SYSCONFDIR="$(sysconfdir)" \
ADJUTRIX_OPTIONS="" \
diff --git a/src/clients/appareo/Makefile.am b/src/clients/appareo/Makefile.am
index ce56b9d..fba5b65 100644
--- a/src/clients/appareo/Makefile.am
+++ b/src/clients/appareo/Makefile.am
@@ -53,7 +53,7 @@ TESTS_ENVIRONMENT = env \
PALUDIS_DISTRIBUTION="gentoo" \
PALUDIS_REPOSITORY_SO_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories`" \
PALUDIS_ENVIRONMENT_SO_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments`" \
- PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/default_output.conf`" \
+ PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/tests_output.conf`" \
PALUDIS_OUTPUT_MANAGERS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/output_managers/`" \
PALUDIS_NO_CHOWN="yupyup" \
PALUDIS_REDUCED_USERNAME="`id -un`" \
diff --git a/src/clients/cave/Makefile.am b/src/clients/cave/Makefile.am
index a75c1bc..ba853d7 100644
--- a/src/clients/cave/Makefile.am
+++ b/src/clients/cave/Makefile.am
@@ -128,7 +128,7 @@ TESTS_ENVIRONMENT = env \
PALUDIS_NO_CHOWN="yupyup" \
PALUDIS_REDUCED_USERNAME="`id -un`" \
PALUDIS_OUTPUTWRAPPER_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/`" \
- PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/default_output.conf`" \
+ PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/tests_output.conf`" \
PALUDIS_OUTPUT_MANAGERS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/output_managers/`" \
TEST_OUTPUT_WRAPPER="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/outputwrapper`" \
SYSCONFDIR="$(sysconfdir)" \
diff --git a/src/clients/importare/Makefile.am b/src/clients/importare/Makefile.am
index 8fe3f32..c7bbbe4 100644
--- a/src/clients/importare/Makefile.am
+++ b/src/clients/importare/Makefile.am
@@ -50,7 +50,7 @@ TESTS_ENVIRONMENT = env \
PALUDIS_NO_CHOWN="yupyup" \
PALUDIS_REDUCED_USERNAME="`id -un`" \
PALUDIS_OUTPUTWRAPPER_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/`" \
- PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/default_output.conf`" \
+ PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/tests_output.conf`" \
PALUDIS_OUTPUT_MANAGERS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/output_managers/`" \
TEST_OUTPUT_WRAPPER="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/outputwrapper`" \
SYSCONFDIR="$(sysconfdir)" \
diff --git a/src/clients/inquisitio/Makefile.am b/src/clients/inquisitio/Makefile.am
index 4184134..08dff5a 100644
--- a/src/clients/inquisitio/Makefile.am
+++ b/src/clients/inquisitio/Makefile.am
@@ -62,7 +62,7 @@ TESTS_ENVIRONMENT = env \
PALUDIS_DISTRIBUTIONS_DIR="$(top_srcdir)/paludis/distributions/" \
PALUDIS_DISTRIBUTION="gentoo" \
PALUDIS_REPOSITORY_SO_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/repositories`" \
- PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/default_output.conf`" \
+ PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/tests_output.conf`" \
PALUDIS_OUTPUT_MANAGERS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/output_managers/`" \
SYSCONFDIR="$(sysconfdir)" \
bash $(top_srcdir)/test/run_test.sh bash
diff --git a/src/clients/instruo/Makefile.am b/src/clients/instruo/Makefile.am
index 3b7720a..68bcf27 100644
--- a/src/clients/instruo/Makefile.am
+++ b/src/clients/instruo/Makefile.am
@@ -55,7 +55,7 @@ TESTS_ENVIRONMENT = env \
PALUDIS_NO_CHOWN="yupyup" \
PALUDIS_REDUCED_USERNAME="`id -un`" \
PALUDIS_OUTPUTWRAPPER_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/`" \
- PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/default_output.conf`" \
+ PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/tests_output.conf`" \
PALUDIS_OUTPUT_MANAGERS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/output_managers/`" \
TEST_OUTPUT_WRAPPER="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/outputwrapper`" \
SYSCONFDIR="$(sysconfdir)" \
diff --git a/src/clients/paludis/Makefile.am b/src/clients/paludis/Makefile.am
index 05482a8..b328c84 100644
--- a/src/clients/paludis/Makefile.am
+++ b/src/clients/paludis/Makefile.am
@@ -71,7 +71,7 @@ TESTS_ENVIRONMENT = env \
PALUDIS_REDUCED_USERNAME="`id -un`" \
PALUDIS_OUTPUTWRAPPER_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/`" \
PALUDIS_BYPASS_USERPRIV_CHECKS="yes" \
- PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/default_output.conf`" \
+ PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/tests_output.conf`" \
PALUDIS_OUTPUT_MANAGERS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/output_managers/`" \
TEST_OUTPUT_WRAPPER="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/outputwrapper`" \
SYSCONFDIR="$(sysconfdir)" \
diff --git a/src/clients/reconcilio/Makefile.am b/src/clients/reconcilio/Makefile.am
index c602bd3..358a68d 100644
--- a/src/clients/reconcilio/Makefile.am
+++ b/src/clients/reconcilio/Makefile.am
@@ -70,7 +70,7 @@ TESTS_ENVIRONMENT = env \
PALUDIS_NO_CHOWN="yupyup" \
PALUDIS_REDUCED_USERNAME="`id -un`" \
PALUDIS_OUTPUTWRAPPER_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/`" \
- PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/default_output.conf`" \
+ PALUDIS_DEFAULT_OUTPUT_CONF="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/tests_output.conf`" \
PALUDIS_OUTPUT_MANAGERS_DIR="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/environments/paludis/output_managers/`" \
TEST_OUTPUT_WRAPPER="`$(top_srcdir)/paludis/repositories/e/ebuild/utils/canonicalise $(top_builddir)/paludis/util/outputwrapper`" \
SYSCONFDIR="$(sysconfdir)" \
diff --git a/src/output/console_install_task.cc b/src/output/console_install_task.cc
index ed32258..3ce86d3 100644
--- a/src/output/console_install_task.cc
+++ b/src/output/console_install_task.cc
@@ -1525,60 +1525,60 @@ ConsoleInstallTask::on_ambiguous_package_name_error(const AmbiguousPackageNameEr
}
void
-ConsoleInstallTask::on_install_action_error(const InstallActionError & e)
+ConsoleInstallTask::on_install_action_error(const std::tr1::shared_ptr<OutputManager> & output_manager, const InstallActionError & e)
{
- output_stream() << endl;
- output_stream() << "Install error:" << endl;
- output_stream() << " * " << e.backtrace("\n * ");
- output_stream() << e.message() << endl;
- output_stream() << endl;
- output_stream() << endl;
+ output_manager->stdout_stream() << endl;
+ output_manager->stdout_stream() << "Install error:" << endl;
+ output_manager->stdout_stream() << " * " << e.backtrace("\n * ");
+ output_manager->stdout_stream() << e.message() << endl;
+ output_manager->stdout_stream() << endl;
+ output_manager->stdout_stream() << endl;
}
void
-ConsoleInstallTask::on_fetch_action_error(const FetchActionError & e)
+ConsoleInstallTask::on_fetch_action_error(const std::tr1::shared_ptr<OutputManager> & output_manager, const FetchActionError & e)
{
- output_stream() << endl;
- output_stream() << "Fetch error:" << endl;
- output_stream() << " * " << e.backtrace("\n * ");
- output_stream() << e.message() << endl;
- output_stream() << endl;
+ output_manager->stdout_stream() << endl;
+ output_manager->stdout_stream() << "Fetch error:" << endl;
+ output_manager->stdout_stream() << " * " << e.backtrace("\n * ");
+ output_manager->stdout_stream() << e.message() << endl;
+ output_manager->stdout_stream() << endl;
if (e.failures())
{
for (Sequence<FetchActionFailure>::ConstIterator f(e.failures()->begin()), f_end(e.failures()->end()) ;
f != f_end ; ++f)
{
- output_stream() << " * File '" << (*f).target_file() << "': ";
+ output_manager->stdout_stream() << " * File '" << (*f).target_file() << "': ";
bool need_comma(false);
if ((*f).requires_manual_fetching())
{
- output_stream() << "requires manual fetching";
+ output_manager->stdout_stream() << "requires manual fetching";
need_comma = true;
}
if ((*f).failed_automatic_fetching())
{
if (need_comma)
- output_stream() << ", ";
- output_stream() << "failed automatic fetching";
+ output_manager->stdout_stream() << ", ";
+ output_manager->stdout_stream() << "failed automatic fetching";
need_comma = true;
}
if (! (*f).failed_integrity_checks().empty())
{
if (need_comma)
- output_stream() << ", ";
- output_stream() << "failed integrity checks: " << (*f).failed_integrity_checks();
+ output_manager->stdout_stream() << ", ";
+ output_manager->stdout_stream() << "failed integrity checks: " << (*f).failed_integrity_checks();
need_comma = true;
}
- output_stream() << endl;
+ output_manager->stdout_stream() << endl;
}
}
- output_stream() << endl;
+ output_manager->stdout_stream() << endl;
}
void
diff --git a/src/output/console_install_task.hh b/src/output/console_install_task.hh
index 2f58b5d..5262580 100644
--- a/src/output/console_install_task.hh
+++ b/src/output/console_install_task.hh
@@ -184,8 +184,8 @@ namespace paludis
virtual void on_had_both_package_and_set_targets_error(const HadBothPackageAndSetTargets &);
virtual void on_multiple_set_targets_specified(const MultipleSetTargetsSpecified &);
- virtual void on_install_action_error(const InstallActionError &);
- virtual void on_fetch_action_error(const FetchActionError &);
+ virtual void on_install_action_error(const std::tr1::shared_ptr<OutputManager> &, const InstallActionError &);
+ virtual void on_fetch_action_error(const std::tr1::shared_ptr<OutputManager> &, const FetchActionError &);
virtual void on_display_failure_summary_pre();
virtual void on_display_failure_summary_success(const DepListEntry &);