[Libreoffice-commits] 2 commits - tb/tb tb/tb_internals.sh

[Libreoffice Gerrit user]

 tb/tb              |    4 ++--
 tb/tb_internals.sh |   16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 1159f7063be1cc5e3d20db65fc9a6e1dbb345718
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sun Feb 3 10:28:25 2013 -0600

    tb: --id is implicitely the user used to talk to gerrit

diff --git a/tb/tb_internals.sh b/tb/tb_internals.sh
index 27ad879..519cb1b 100644
--- a/tb/tb_internals.sh
+++ b/tb/tb_internals.sh
@@ -993,7 +993,7 @@ local gzlog=
         log_msgs "Report Cancellation for gerrit ref ${GERRIT_TASK_TICKET?}"
         status="canceled"
     fi
-    cat "${gzlog}" | ssh ${TB_GERRIT_HOST?} buildbot put --id ${TB_ID?} --ticket "${GERRIT_TASK_TICKET?}" --status $status --log -
+    cat "${gzlog}" | ssh ${TB_GERRIT_HOST?} buildbot put --ticket "${GERRIT_TASK_TICKET?}" --status $status --log -
 }
 
 
@@ -1311,7 +1311,7 @@ select_next_gerrit_task()
     GERRIT_TASK_BRANCH=""
     GERRIT_TASK_REF=""
     GERRIT_TASK_FEATURE=""
-    result=$(ssh ${TB_GERRIT_HOST?} buildbot get -p core --id ${TB_ID?} -a ${tb_GERRIT_PLATFORM?} --format BASH ${tb_GERRIT_BRANCHES?})
+    result=$(ssh ${TB_GERRIT_HOST?} buildbot get -p core -a ${tb_GERRIT_PLATFORM?} --format BASH ${tb_GERRIT_BRANCHES?})
     [ $V ] && echo "Get task result:${result}"
 
     has_task=$(echo "$result" | grep "^GERRIT_TASK_")
commit fa33b58aa70e85590f02d02820c3338ebd2e7da5
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Sun Jan 27 12:23:08 2013 -0600

    tb: cahnge the stop semaphore location to ~/.tb/stop

diff --git a/tb/tb b/tb/tb
index 69c7f88..683c062 100755
--- a/tb/tb
+++ b/tb/tb
@@ -238,7 +238,7 @@ case "$1" in
         exit $?
         ;;
     stop)
-        touch ~/.tb/meta/stop
+        touch ~/.tb/stop
         exit $?
         ;;
 esac
@@ -397,7 +397,7 @@ setup_profile_defaults
 verify_command
 
 # remove lingering stop semaphore file
-rm -f ~/.tb/meta/stop
+rm -f ~/.tb/stop
 
 case "${tb_MODE?}" in
     dual)
diff --git a/tb/tb_internals.sh b/tb/tb_internals.sh
index 861de7a..27ad879 100644
--- a/tb/tb_internals.sh
+++ b/tb/tb_internals.sh
@@ -609,7 +609,7 @@ interupted_build()
         fi
     fi
     # propagate the stop request to the main loop
-    touch ${TB_METADATA_DIR?}/stop
+    touch ${tb_CONFIG_DIR?}/stop
 
     exit 4
 }
@@ -669,7 +669,7 @@ load_profile()
             fi
         else
             if [ -n "${old_ccache_dir}" ] ; then
-                CCACHE="${old_ccache_dir?}"
+                CCACHE_DIR="${old_ccache_dir?}"
             fi
         fi
     fi
@@ -1093,7 +1093,7 @@ local s=0
     while true; do
 
         # Check for stop request
-        if [ -f ${TB_METADATA_DIR?}/stop ] ; then
+        if [ -f ${tb_CONFIG_DIR?}/stop ] ; then
             break;
         else
             sleep ${s?}
@@ -1128,9 +1128,9 @@ local s=0
 
     # if we were stopped by request, let's log that
     # clean the semaphore file
-    if [ -f ${TB_METADATA_DIR?}/stop ] ; then
+    if [ -f ${tb_CONFIG_DIR?}/stop ] ; then
         log_msgs "Stoped by request"
-        rm ${TB_METADATA_DIR?}/stop
+        rm ${tb_CONFIG_DIR?}/stop
     fi
 
 }
@@ -1278,7 +1278,7 @@ run_one_tb()
 #
 run_primer()
 {
-    check_branch_profiles
+    check_branches_profile
 
     # as a special case the select_next_task
     # if tb_ONE_SHOT=1 return the first branch