aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRick Farina (Zero_Chaos) <zerochaos@gentoo.org>2014-08-28 14:30:36 -0400
committerRick Farina (Zero_Chaos) <zerochaos@gentoo.org>2014-08-28 14:30:36 -0400
commit08cf4285e90a4521340ba1714ee0c0f80176de71 (patch)
tree32dd293548a7ba9c0ec258028743b9e8e929458c /tinderbox
parentcleanup logic from b90b4fb30b9f9b0b37c8804d770dcc4 (diff)
downloadqa-scripts-08cf4285e90a4521340ba1714ee0c0f80176de71.tar.gz
qa-scripts-08cf4285e90a4521340ba1714ee0c0f80176de71.tar.bz2
qa-scripts-08cf4285e90a4521340ba1714ee0c0f80176de71.zip
proper fix for empty logging dir
revert 6f206114aa3b978fc7206cd2d329114db461ea55, proper fix is to just use recursive grep.
Diffstat (limited to 'tinderbox')
-rw-r--r--tinderbox/bashrc6
1 files 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