[gentoo-commits] proj/qa-scripts:master commit in: tinderbox/

[Richard Farina]

commit:     08cf4285e90a4521340ba1714ee0c0f80176de71
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 28 18:30:36 2014 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Aug 28 18:30:36 2014 +0000
URL:        
http://sources.gentoo.org/gitweb/?p=proj/qa-scripts.git;a=commit;h=08cf4285

proper fix for empty logging dir

revert 6f206114aa3b978fc7206cd2d329114db461ea55, proper fix is to just
use recursive grep.

---
 tinderbox/bashrc | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/tinderbox/bashrc b/tinderbox/bashrc
index 6d21868..b378dac 100644
--- a/tinderbox/bashrc
+++ b/tinderbox/bashrc
@@ -108,11 +108,9 @@ tinderbox_postinst_checks() {
 
        SANDBOX_ON=0 cp "${T}"/testsfailed "${BUILD_DATA_DIR}" 2> /dev/null
        SANDBOX_ON=0 find "${T}" -name "tinderbox-*.log" -not -empty -execdir 
mv '{}' "${BUILD_DATA_DIR}" \;
-       if [ ls "${T}"/logging/* > /dev/null 2>&1 ] ; then
-               SANDBOX_ON=0 grep --no-filename QA "${T}"/logging/* > 
"${BUILD_DATA_DIR}"/portageqa
-       fi
+       SANDBOX_ON=0 grep --no-filename -r QA "${T}"/logging/ > 
"${BUILD_DATA_DIR}"/portageqa
 
-       if [[ ! -s "${BUILD_DATA_DIR}"/portageqa ]] && [ -f 
"${BUILD_DATA_DIR}"/portageqa ] ; then
+       if [[ ! -s "${BUILD_DATA_DIR}"/portageqa ]] ; then
                SANDBOX_ON=0 rm "${BUILD_DATA_DIR}"/portageqa
        fi