Changeset 24743 for branches/czw_branch/cleanup/ippTools/src/pxtools.c

Timestamp:

Jul 10, 2009, 5:53:18 PM (17 years ago)

Author:

watersc1

Message:

Altered ippTools to support scrubbed as a full state like cleaned.

Changed ipp_cleanup.pl to insist that config files exist if a run is to be cleaned, and that the config files not exist if a run is to be scrubbed.

Added science.cleanup.pro to Makefile.am to ensure it is installed properly.

File:

• branches/czw_branch/cleanup/ippTools/src/pxtools.c (modified) (2 diffs)

branches/czw_branch/cleanup/ippTools/src/pxtools.c

@@ -37 +37 @@
     if (!strcmp(state, "goto_cleaned")) return true;
     if (!strcmp(state, "error_cleaned")) return true;
+    if (!strcmp(state, "goto_purged")) return true;
+    if (!strcmp(state, "error_purged")) return true;
     if (!strcmp(state, "goto_scrubbed")) return true;
     if (!strcmp(state, "error_scrubbed")) return true;
@@ -42 +44 @@
     if (!strcmp(state, "update")) return true;
     if (!strcmp(state, "purged")) return true;
-    if (!strcmp(state, "goto_purged")) return true;
-    if (!strcmp(state, "error_purged")) return true;
-
+    if (!strcmp(state, "scrubbed")) return true;
     return false;
 }
 
-// 'scrubbed' is a virtual state equivalent to cleaned, but allows files to be removed
-// even if the config files is missing
+// 'scrubbed' is no longer a virtual state equivalent to cleaned, but allows files to be removed
+// even if the config files is missing.  This change was prompted as files that are cleaned can
+// be regenerated, but that is not certain after being scrubbed.