From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id E139A138A2F for ; Thu, 28 Aug 2014 18:30:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 914B4E08B8; Thu, 28 Aug 2014 18:30:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3918FE08B8 for ; Thu, 28 Aug 2014 18:30:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0DECB33F9FC for ; Thu, 28 Aug 2014 18:30:54 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7246E41C2 for ; Thu, 28 Aug 2014 18:30:52 +0000 (UTC) From: "Richard Farina" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Richard Farina" Message-ID: <1409250636.08cf4285e90a4521340ba1714ee0c0f80176de71.zerochaos@gentoo> Subject: [gentoo-commits] proj/qa-scripts:master commit in: tinderbox/ X-VCS-Repository: proj/qa-scripts X-VCS-Files: tinderbox/bashrc X-VCS-Directories: tinderbox/ X-VCS-Committer: zerochaos X-VCS-Committer-Name: Richard Farina X-VCS-Revision: 08cf4285e90a4521340ba1714ee0c0f80176de71 X-VCS-Branch: master Date: Thu, 28 Aug 2014 18:30:52 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 77f0e868-9264-40c1-905c-4cd231877903 X-Archives-Hash: 713c09bee93ed716a4c5e0ed4db023d8 commit: 08cf4285e90a4521340ba1714ee0c0f80176de71 Author: Rick Farina (Zero_Chaos) gentoo org> AuthorDate: Thu Aug 28 18:30:36 2014 +0000 Commit: Richard Farina gentoo 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