From 644ad886249dbd8f2356fae1d1148a429a2ee95f Mon Sep 17 00:00:00 2001
From: Rob Petti <rpetti@autonomy.com>
Date: Thu, 9 May 2013 16:52:45 -0600
Subject: [PATCH] [JENKINS-17439] add a warning if a file still exists after it
 is deleted

---
 .../hudson/plugins/perforce/QuickCleanerCall.java  | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/main/java/hudson/plugins/perforce/QuickCleanerCall.java b/src/main/java/hudson/plugins/perforce/QuickCleanerCall.java
index 5b3273d..7fb5526 100644
--- a/src/main/java/hudson/plugins/perforce/QuickCleanerCall.java
+++ b/src/main/java/hudson/plugins/perforce/QuickCleanerCall.java
@@ -188,12 +188,16 @@ public void run() {
                         String filename = line.replace("- file(s) not on client.", "").trim();
                         File file = new File(workDir, filename);
                         if (!safelyDelete(file)) {
-                            log("Error deleting file: " + filename);
+                            log("WARNING: Problem deleting file during quick clean: " + filename);
                         }
                     }
                 }
             } catch (IOException e) {
-                // TODO: Handle IO errors
+                try {
+                    log("Exception occurred while cleaning files: " + e.getMessage());
+                } catch (IOException ignored) {
+                    // can't do anything about this
+                }
             } finally {
                 IOUtils.closeQuietly(in);
                 IOUtils.closeQuietly(log);
@@ -206,7 +210,11 @@ private boolean safelyDelete(File file) throws IOException {
             while ((testPath = testPath.getParentFile()) != null) {
                 if (testPath.equals(parent)) {
                     Util.deleteFile(file);
-                    return true;
+                    if(!file.exists()) {
+                        return true;
+                    } else {
+                        return false;
+                    }
                 }
             }
             log("Warning, file outside workspace not cleaned: " + file.getPath());