From b74f22fb9456e21dadc7e6cd8b94f787a9a04687 Mon Sep 17 00:00:00 2001
From: Harald Musum <musum@verizonmedia.com>
Date: Tue, 10 Mar 2020 15:18:23 +0100
Subject: Revert "Keep temp files if force is true (for debugging)"

---
 .../vespa/model/application/validation/RankSetupValidator.java      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankSetupValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankSetupValidator.java
index c2225c93a4e..7f8ff6edd85 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankSetupValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/RankSetupValidator.java
@@ -33,7 +33,7 @@ import java.util.logging.Logger;
 
 /**
  * Validate rank setup for all search clusters (rank-profiles, index-schema, attributes configs), validating done
- * by running through the binary 'vespa-verify-ranksetup'. Will not delete temporary files if <em>force</em> is true
+ * by running through the binary 'vespa-verify-ranksetup'
  *
  * @author vegardh
  */
@@ -71,7 +71,7 @@ public class RankSetupValidator extends Validator {
         } catch (IOException e) {
             throw new RuntimeException(e);
         } finally {
-            if (cfgDir != null && !force)
+            if (cfgDir != null)
                 deleteTempDir(cfgDir);
         }
     }
@@ -80,7 +80,7 @@ public class RankSetupValidator extends Validator {
         Instant start = Instant.now();
         try {
             boolean ret = execValidate(configId, searchCluster, sdName, deployLogger);
-            if (!ret && !force) {
+            if (!ret) {
                 // Give up, don't say same error msg repeatedly
                 deleteTempDir(tempDir);
             }
-- 
cgit v1.2.3