From 378b0759265dd690924000229d432b027af13718 Mon Sep 17 00:00:00 2001
From: Ciaran McCreesh <ciaran.mccreesh@googlemail.com>
Date: Fri, 27 Aug 2010 10:15:36 +0100
Subject: log_path can be set in output.conf

Fixes: ticket:976
---
 paludis/environments/paludis/default_output.conf | 11 ++++++++---
 paludis/environments/paludis/output_conf.cc      |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/paludis/environments/paludis/default_output.conf b/paludis/environments/paludis/default_output.conf
index c86ac88ed..ae70c50b6 100644
--- a/paludis/environments/paludis/default_output.conf
+++ b/paludis/environments/paludis/default_output.conf
@@ -18,6 +18,11 @@
 #
 #   extra_message_managers may be used to define additional output managers that
 #   process messages.
+#
+#   log_path can be set to change where log files are saved. It defaults to
+#   ${root}/var/log/paludis .
+
+log_path ?= ${root}/var/log/paludis
 
 # First, we define some basic rules. If we're running exclusively, use the
 # 'exclusive' manager:
@@ -102,7 +107,7 @@ if_unset = log_output_keep_failures
 # location of the log when our output manager is closed:
 [manager log_output_keep_failures]
 handler = file
-filename = ${root}/var/log/paludis/%{time}-%{action}-%{full_name}.out
+filename = ${log_path}/%{time}-%{action}-%{full_name}.out
 keep_on_empty = false
 keep_on_success = false
 summary_output_manager = format_messages_standard
@@ -112,7 +117,7 @@ summary_output_message = Output log: ${filename}
 # 'always_keep_output_logs' is 'true'.
 [manager log_output_keep_always]
 handler = file
-filename = ${root}/var/log/paludis/%{time}-%{action}-%{full_name}.out
+filename = ${log_path}/%{time}-%{action}-%{full_name}.out
 keep_on_empty = false
 keep_on_success = true
 summary_output_manager = format_messages_standard
@@ -158,7 +163,7 @@ children = log_messages_always ${extra_message_managers}
 # Our messages log goes to a file, which gets discarded only if it is empty:
 [manager log_messages_always]
 handler = file
-filename = ${root}/var/log/paludis/%{time}-%{action}-%{full_name}.messages
+filename = ${log_path}/%{time}-%{action}-%{full_name}.messages
 keep_on_empty = false
 keep_on_success = true
 summary_output_manager = format_messages_standard
diff --git a/paludis/environments/paludis/output_conf.cc b/paludis/environments/paludis/output_conf.cc
index dc5834e6f..21407d434 100644
--- a/paludis/environments/paludis/output_conf.cc
+++ b/paludis/environments/paludis/output_conf.cc
@@ -333,7 +333,7 @@ OutputConf::add(const FSPath & filename)
     Context context("When adding source '" + stringify(filename) + "' as an output file:");
 
     std::shared_ptr<KeyValueConfigFile> f(make_bashable_kv_conf(filename,
-                _imp->predefined_variables, { kvcfo_allow_sections }));
+                _imp->predefined_variables, { kvcfo_allow_sections, kvcfo_allow_fancy_assigns }));
     if (! f)
         return;
 
-- 
cgit v1.2.3