From b418a57f0105c1cddb4c2b3e82dfe09224c3a6bb Mon Sep 17 00:00:00 2001
From: George Danchev <danchev@spnet.net>
Date: Fri, 15 Jul 2011 18:05:14 +0000
Subject: [PATCH] on cleanup, do cleanup and exit, only check for KEEP

---
 releng/inc/releng_getopts.inc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/releng/inc/releng_getopts.inc b/releng/inc/releng_getopts.inc
index 00d61e9c..0263ca12 100644
--- a/releng/inc/releng_getopts.inc
+++ b/releng/inc/releng_getopts.inc
@@ -37,7 +37,8 @@ unboldify() {
 
 #############################################
 cleanup() {
- if [ ${KEEP} -eq 0 -a ${CLEANUP} -eq 1 ]; then
+# if [ ${KEEP} -eq 0 -a ${CLEANUP} -eq 1 ]; then
+ if [ ${KEEP} -eq 0 ]; then
    # safety net, just in case -> we want to be in the starting
    # directory before removing whatever self-generated stuff
    if [ -d "${GEN_DATA_DIR}" ]; then
@@ -138,6 +139,8 @@ do
   elif test x"$i" = x"-c"
   then
        CLEANUP=1
+       cleanup
+       exit 0
   elif test x"$i" = x"-f"
   then
        SIMULATE_FAILURE=1