From 9cb8b99353591bc061d380331965f952efcf1200 Mon Sep 17 00:00:00 2001
From: Nico Schottelius <nico@kr.ethz.ch>
Date: Sat, 15 Jan 2011 01:54:55 +0100
Subject: [PATCH] simply check for incomplete backups

Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
---
 ccollect | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/ccollect b/ccollect
index a7ce55b..62b3a05 100755
--- a/ccollect
+++ b/ccollect
@@ -448,18 +448,14 @@ while [ "${source_no}" -lt "${no_sources}" ]; do
    ( pcmd cd "${ddir}" ) || _exit_err "Cannot change to ${ddir}. Skipping."
 
    #
-   # Check: incomplete backups? (needs echo to remove newlines)
+   # Check incomplete backups (needs echo to remove newlines)
    #
-   # *.marker: not possible, creates an error, if no *.marker exists
-   # -> catch return value
+   pcmd ls -d1 "${ddir}" | grep "${CMARKER}\$" > "${TMP}" ||\
+      _exit_err "Cannot list incomplete files"
 
-   pcmd ls -d1 "${ddir}/"*"${CMARKER}" > "${TMP}" 2>/dev/null; ret=$?
-
-   if [ "${ret}" -eq 0 ]; then
-      _techo "Incomplete backups: $(echo $(cat "${TMP}"))"
-      if [ -f "${c_delete_incomplete}" ]; then
-         delete_from_file "${TMP}" "${CMARKER}"
-      fi
+   _techo "Incomplete backups: $(echo $(cat "${TMP}"))"
+   if [ -f "${c_delete_incomplete}" ]; then
+      delete_from_file "${TMP}" "${CMARKER}"
    fi
 
    #