From d7fa8c819bb886e4249001772be71551fd88a081 Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Wed, 22 May 2013 00:21:18 +0200
Subject: [PATCH] webbuild-functions: (re)implement log dir special case for
 autodist user in chroot environment

---
 webbuild/webbuild-functions | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/webbuild/webbuild-functions b/webbuild/webbuild-functions
index 50ea163..f8dba7e 100644
--- a/webbuild/webbuild-functions
+++ b/webbuild/webbuild-functions
@@ -267,7 +267,11 @@ function print_environment_descr() {
 function environment_autoport_logdir() {
       local env=$1
       if [ "${AUTOPORT_CHROOT[$env]}" ]; then
-         echo "/var/autoport/${AUTOPORT_CHROOT[$env]}/home/${AUTOPORT_CHROOT_USER[$env]}/.autoport/"
+         if [ "${AUTOPORT_CHROOT_USER[$env]}" != "autodist" ]; then
+            echo "/var/autoport/${AUTOPORT_CHROOT[$env]}/home/${AUTOPORT_CHROOT_USER[$env]}/.autoport/"
+         else
+            echo "/var/autoport/${AUTOPORT_CHROOT[$env]}/var/autodist/.autoport/"
+         fi
       elif [ "${AUTOPORT_NATIVE[$env]}" ]; then
          local envhome=`eval echo ~${AUTOPORT_CHROOT_USER[$env]}`
          echo "$envhome/.autoport"
@@ -277,8 +281,12 @@ function environment_autoport_logdir() {
 function environment_logdir() {
       local env=$1
       if [ "${AUTOPORT_CHROOT[$env]}" ]; then
-         echo "/var/autoport/${AUTOPORT_CHROOT[$env]}/home/${AUTOPORT_CHROOT_USER[$env]}/.autodist/log/"
-      elif [ "${AUTOPORT_NATIVE[$env]}" ]; then
+         if [ "${AUTOPORT_CHROOT_USER[$env]}" != "autodist" ]; then
+            echo "/var/autoport/${AUTOPORT_CHROOT[$env]}/home/${AUTOPORT_CHROOT_USER[$env]}/.autodist/log/"
+         else
+            echo "/var/autoport/${AUTOPORT_CHROOT[$env]}/var/autodist/.autoport/"
+         fi
+      elif [ "${AUTOPORT_NATIVE[$env]}" -o "${AUTOPORT_CHROOT[$env]}" ]; then
          local envhome=`eval echo ~${AUTOPORT_CHROOT_USER[$env]}`
          if [ "${AUTOPORT_CHROOT_USER[$env]}" = "autodist" ]; then
             echo "$envhome/log"