[Rt-commit] rt branch, 4.0/trap-scripcondition-on-db-upgrade, created. rt-4.0.5-112-gdcd158e

[Jim Brandt]

The branch, 4.0/trap-scripcondition-on-db-upgrade has been created
        at  dcd158e8e8336c7908eaf9e2922b29740077517e (commit)

- Log -----------------------------------------------------------------
commit dcd158e8e8336c7908eaf9e2922b29740077517e
Author: Jim Brandt <jbrandt at bestpractical.com>
Date:   Mon Apr 2 10:21:53 2012 -0400

    Add eval to trap fatal on scrip condition lookup when the condition id is 0.

diff --git a/etc/upgrade/3.7.19/content b/etc/upgrade/3.7.19/content
index 31ab1c8..ff43dd0 100644
--- a/etc/upgrade/3.7.19/content
+++ b/etc/upgrade/3.7.19/content
@@ -24,14 +24,25 @@ sub add_description_to_all_scrips {
 
 sub gen_scrip_description {
     my $scrip = shift;
-    my $condition = $scrip->ConditionObj->Name
+
+    my $condition;
+    eval{
+      $condition = $scrip->ConditionObj->Name
         || $scrip->ConditionObj->Description
-        || ('On Condition #'. $scrip->Condition);
+	|| ('On Condition #'. $scrip->Condition);
+    };
+
+    if ($@){
+      print STDERR $@;
+      print STDERR "Reference to missing scrip condition found. If you have ScripCondition = 0 in the Scrips table, update with a real condition number.\n";
+      $condition = 'On undefined Condition # 0';
+    }
+
     my $action = $scrip->ActionObj->Name
         || $scrip->ActionObj->Description
         || ('Run Action #'. $scrip->Action);
     return join ' ', $condition, $action;
-}
+  }
 }
 
 1;

-----------------------------------------------------------------------