Changeset 13990 for branches/backtrack/ippTools/src/regtool.c

Timestamp:

Jun 28, 2007, 12:01:22 PM (19 years ago)

Author:

jhoblitt

Message:

refactor chiptool & db to preserve metadata history

File:

• branches/backtrack/ippTools/src/regtool.c (modified) (2 diffs)

branches/backtrack/ippTools/src/regtool.c

@@ -620 +620 @@
         }
 
-        // insert an entry into the chipPendingExp table
-        if (!chipQueueExpTag(config, exp_tag, NULL, NULL, NULL, NULL, NULL)) {
-            // rollback
-            if (!psDBRollback(config->dbh)) {
-                psError(PS_ERR_UNKNOWN, false, "database error");
-            }
-            psError(PS_ERR_UNKNOWN, false, "failed to queue chipPendingExp");
-            psFree(output);
-            return false;
-        }
 
         // set the state for the newExp to stop
@@ -638 +628 @@
             }
             psError(PS_ERR_UNKNOWN, false, "failed to change newExp.state for exp_tag: %s", exp_tag);
+            psFree(output);
+            return false;
+        }
+
+        // insert an entry into the chipPendingExp table
+        // this can only be run as the newExp's state has been set to stop
+        if (!chipQueueExpTag(config, exp_tag, NULL, NULL, NULL, NULL, NULL)) {
+            // rollback
+            if (!psDBRollback(config->dbh)) {
+                psError(PS_ERR_UNKNOWN, false, "database error");
+            }
+            psError(PS_ERR_UNKNOWN, false, "failed to queue chipPendingExp");
             psFree(output);
             return false;