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

[Libreoffice Gerrit user]

 tb/tb           |    2 +-
 tb/tb_phases.sh |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 52208c9fa5063d2ae15ce8f7834ba8f9b76dae0a
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Mon Jan 21 13:51:54 2013 -0600

    TB_PROFILE_DIR is tb_PROFILE_DIR and fix path to branch's config

diff --git a/tb/tb_phases.sh b/tb/tb_phases.sh
index 41eb445..e6daf74 100644
--- a/tb/tb_phases.sh
+++ b/tb/tb_phases.sh
@@ -114,13 +114,13 @@ canonical_post_make()
     if [ "${tb_BUILD_TYPE?}" = "tb" ] ; then
         if [ "${R}" != "0" ] ; then
             if [ -f "${tb_REPORT_LOG?}" ] ; then
-                if [ -f "${TB_PROFILE_DIR?}/${B?}/false_negatives" ] ; then
-                    grep -F "$(cat "${TB_PROFILE_DIR?}/${B?}/false_negatives")" "${tb_REPORT_LOG?}" && R="2"
+                if [ -f "${tb_PROFILE_DIR?}/branches/${B?}/false_negatives" ] ; then
+                    grep -F "$(cat "${tb_PROFILE_DIR?}/branhces/${B?}/false_negatives")" "${tb_REPORT_LOG?}" && R="2"
                     if [ "${R?}" == "2" ] ; then
                         log_msgs "False negative detected"
                     fi
-                elif [ -f "${TB_PROFILE_DIR?}/false_negatives" ] ; then
-                    grep -F "$(cat "${TB_PROFILE_DIR?}/false_negatives")" "${tb_REPORT_LOG?}" && R="2"
+                elif [ -f "${tb_PROFILE_DIR?}/false_negatives" ] ; then
+                    grep -F "$(cat "${tb_PROFILE_DIR?}/false_negatives")" "${tb_REPORT_LOG?}" && R="2"
                     if [ "${R?}" == "2" ] ; then
                         log_msgs "False negative detected"
                     fi
commit 4e79b6f1724ad82e2739b0efa1d56a608a7e6937
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Mon Jan 21 13:51:09 2013 -0600

    typo dev/nukk => dev/null

diff --git a/tb/tb b/tb/tb
index 0777718..90708c8 100755
--- a/tb/tb
+++ b/tb/tb
@@ -19,7 +19,7 @@ fi
 tb_BIN_DIR=$(dirname "$0")
 pushd ${tb_BIN_DIR} > /dev/null
 tb_BIN_DIR=$(pwd)
-popd > /dev/nukk
+popd > /dev/null
 
 source "${tb_BIN_DIR?}/tb_internals.sh"