Changeset 34197 for trunk/ippTools/src/pxtools.c

Timestamp:

Jul 24, 2012, 3:27:58 PM (14 years ago)

Author:

bills

Message:

Allow -updaterun modes of the various tools to -set_state update.
This was disallowed previously due to dangerous interactions with
magic. Now it is useful allow the postage stamp server to call off cleanup
for files that it needs.

File:

• trunk/ippTools/src/pxtools.c (modified) (4 diffs)

trunk/ippTools/src/pxtools.c

@@ -301 +301 @@
     PXOPT_LOOKUP_STR(note, config->args,        "-set_note", false, false);
 
+#ifdef DISALLOW_CHANGE_TO_UPDATE
+    // Back in the days of magic we didn't allow state changes of Run's
+    // to update because the interaction with destreaking was problematic
+    // With the death of magic we can allow this now.
     if ((state)&&(!strcmp(state, "update"))) {
         fprintf(stderr, "'-updaterun -set_state update' is not supported.");
@@ -310 +314 @@
         exit(1);
     }
-
+#endif
     psString dist_group = NULL;
     if (has_dist_group) {
@@ -350 +354 @@
     psString joinHook = psStringCopy("");
     psString fileWhere = NULL;
+
+#ifdef DISALLOW_CHANGE_TO_UPDATE
     if (state && !strcmp(state, "update")) {
         psStringAppend(&joinHook, "\n JOIN %s USING(%s)", fileTable, idColumn);
@@ -355 +361 @@
         psStringAppend(&fileWhere, "AND %s.data_state = 'cleaned'", fileTable);
     }
+#endif
 
     psString whereClause =  psDBGenerateWhereSQL(where, NULL);