[Libreoffice-commits] buildbot.git: tb/tb_internals.sh

[Thorsten Behrens]

 tb/tb_internals.sh |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 5ced15eedd2bfd5f55366c488095539417bedc70
Author: Thorsten Behrens <thb at documentfoundation.org>
Date:   Sat Nov 16 01:01:53 2013 +0100

    Fix fallback logic for install set searching.

diff --git a/tb/tb_internals.sh b/tb/tb_internals.sh
index 45ff9f7..b18c93c 100644
--- a/tb/tb_internals.sh
+++ b/tb/tb_internals.sh
@@ -530,11 +530,13 @@ push_nightly()
 
     if [ -f config_host.mk ] ; then
         inpath=$(grep INPATH= config_host.mk | sed -e "s/.*=//")
-    fi
-    if [ -z "${inpath?}" -o  -d "instsetoo_native/${inpath?}" ] ; then
-        pack_loc="instsetoo_native/${inpath?}"
+        if [ -n "${inpath?}" -a -d "instsetoo_native/${inpath?}" ] ; then
+            pack_loc="instsetoo_native/${inpath?}"
+        else
+            pack_loc="workdir"
+        fi
     else
-        pack_loc="workdir"
+        pack_loc="instsetoo_native/${inpath?}"
     fi
     pushd "${pack_loc?}" > /dev/null
     rm -fr push