[Jifty-commit] jifty branch, master, updated. 1.10518-20-g7697c16

Jifty commits jifty-commit at lists.jifty.org
Mon Jun 6 11:28:42 EDT 2011


The branch, master has been updated
       via  7697c16f4916c0eab864153a58c6a3007bdb7c9a (commit)
      from  7c8e4ee5d32f2eb6155726b24c453eac6474eea3 (commit)

Summary of changes:
 lib/Jifty/Script/Schema.pm |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

- Log -----------------------------------------------------------------
commit 7697c16f4916c0eab864153a58c6a3007bdb7c9a
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Mon Jun 6 11:28:26 2011 -0400

    Don't lose errors in our eval when building the upgrade steps

diff --git a/lib/Jifty/Script/Schema.pm b/lib/Jifty/Script/Schema.pm
index ae1ce13..d3971e0 100755
--- a/lib/Jifty/Script/Schema.pm
+++ b/lib/Jifty/Script/Schema.pm
@@ -572,6 +572,11 @@ sub upgrade_tables {
             $upgradeclass->versions();
     };
 
+    if ($@) {
+        $log->error("Error collecting upgrade steps: $@");
+        return;
+    }
+
     for my $model_class ( grep {/^\Q$baseclass\E::Model::/}
         $self->schema->models )
     {

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


More information about the Jifty-commit mailing list