Changeset 34241 for branches/eam_branches/ipp-20120627/ippTools/src/pxtools.c

Timestamp:

Jul 31, 2012, 11:38:18 AM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20120627/ippTools/src

Files:

• . (modified) (1 prop)
• pxtools.c (modified) (4 diffs)

branches/eam_branches/ipp-20120627/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);