From ccf4cda924abb8be1b3a1beeca9a2ff4b52e2021 Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Sat, 2 Feb 2013 14:22:14 +0100
Subject: [PATCH] webbuild: support for special 'autodist' user path in chroot
 mode

---
 webbuild/webbuild-functions | 18 +++++-------------
 webbuild/webbuild-sudo      |  9 +++++++--
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/webbuild/webbuild-functions b/webbuild/webbuild-functions
index 939bfe4..21ece5a 100644
--- a/webbuild/webbuild-functions
+++ b/webbuild/webbuild-functions
@@ -241,7 +241,9 @@ function google_search() {
 function print_environment_descr() {
    local i=$1
 
-   if [ "${AUTOPORT_CHROOT_USER[$i]}" ]; then
+   if [ "${AUTOPORT_CHROOT[$i]}" ]; then
+      echo -n "${AUTOPORT_CHROOT[$i]} - "
+   elif [ "${AUTOPORT_CHROOT_USER[$i]}" ]; then
       echo -n "${AUTOPORT_CHROOT_USER[$i]} - "
    else
       echo -n "autodist - "
@@ -264,12 +266,7 @@ function print_environment_descr() {
 function environment_autoport_logdir() {
       local env=$1
       if [ "${AUTOPORT_CHROOT[$env]}" ]; then
-         # FIXME: be able to detect real home without using chroot
-         if [ "${AUTOPORT_CHROOT_USER[$env]}" = "autodist" ]; then
-            echo "/var/autoport/${AUTOPORT_CHROOT[$env]}/var/autodist/.autoport/"
-         else
-            echo "/var/autoport/${AUTOPORT_CHROOT[$env]}/home/${AUTOPORT_CHROOT_USER[$env]}/.autoport/"
-         fi
+         echo "/var/autoport/${AUTOPORT_CHROOT[$env]}/home/${AUTOPORT_CHROOT_USER[$env]}/.autoport/"
       elif [ "${AUTOPORT_NATIVE[$env]}" ]; then
          local envhome=`eval echo ~${AUTOPORT_CHROOT_USER[$env]}`
          echo "$envhome/.autoport"
@@ -279,12 +276,7 @@ function environment_autoport_logdir() {
 function environment_logdir() {
       local env=$1
       if [ "${AUTOPORT_CHROOT[$env]}" ]; then
-         # FIXME: be able to detect real home without using chroot
-         if [ "${AUTOPORT_CHROOT_USER[$env]}" = "autodist" ]; then
-            echo "/var/autoport/${AUTOPORT_CHROOT[$env]}/var/autodist/log/"
-         else
-            echo "/var/autoport/${AUTOPORT_CHROOT[$env]}/home/${AUTOPORT_CHROOT_USER[$env]}/.autodist/log/"
-         fi
+         echo "/var/autoport/${AUTOPORT_CHROOT[$env]}/home/${AUTOPORT_CHROOT_USER[$env]}/.autodist/log/"
       elif [ "${AUTOPORT_NATIVE[$env]}" ]; then
          local envhome=`eval echo ~${AUTOPORT_CHROOT_USER[$env]}`
          if [ "${AUTOPORT_CHROOT_USER[$env]}" = "autodist" ]; then
diff --git a/webbuild/webbuild-sudo b/webbuild/webbuild-sudo
index 94c77db..8ac110d 100755
--- a/webbuild/webbuild-sudo
+++ b/webbuild/webbuild-sudo
@@ -42,9 +42,14 @@ if [ "$ENVIRONMENT" = "local" ]; then
 elif [ "${AUTOPORT_CHROOT[$ENVIRONMENT]}" ]; then
    ENVPREFIX="/var/autoport/${AUTOPORT_CHROOT[$ENVIRONMENT]}"
    ENVUSER=${AUTOPORT_CHROOT_USER[$ENVIRONMENT]}
-   WORKINGHOME="/usr/src/"
+   if [ "${AUTOPORT_CHROOT_USER[$ENVIRONMENT]}" = "autodist" ]; then
+      WORKINGHOME="/var/autodist/"
+      RPMBUILDROOT="/var/tmp/autodist/"
+   else
+      WORKINGHOME="/usr/src/"
+      RPMBUILDROOT="/var/tmp/"
+   fi
    SUCMDPREFIX="chroot $ENVPREFIX su -l ${AUTOPORT_CHROOT_USER[$ENVIRONMENT]} -c"
-   RPMBUILDROOT="/var/tmp/"
    [ "$TMPFILE" ] && {
       cp $TMPFILE /var/autoport/${AUTOPORT_CHROOT[$ENVIRONMENT]}/$TMPFILE
       chmod 755 /var/autoport/${AUTOPORT_CHROOT[$ENVIRONMENT]}/$TMPFILE