Changeset 27052

Timestamp:

Feb 24, 2010, 11:03:47 AM (16 years ago)

Author:

Paul Price

Message:

Require magic to have been performed.
This check has been made at the definerun part, but it's good to double-check here too.
In fact, it's necessary to double-check here, because we have runs we want to re-publish that have non-magicked data. I don't want to delete the publishRun from the database, but nor can I just delete the publishDone because that won't enforce magicked data.

File:

• trunk/ippTools/share/pubtool_pending.sql (modified) (2 diffs)

trunk/ippTools/share/pubtool_pending.sql

@@ -27 +27 @@
         AND publishRun.state = 'new'
         AND diffRun.state = 'full'
+        AND (diffRun.magicked > 0 OR diffRun.diff_mode = 4 OR publishClient.magicked = 0)
         -- WHERE hook %s
     UNION
@@ -47 +48 @@
         AND publishRun.state ='new'
         AND camRun.state = 'full'
+        AND (camRun.magicked > 0 OR publishClient.magicked = 0)
         -- WHERE hook %s
 ) AS publishToDo