[jifty-devel] schema --setup problem

[Dobrica Pavlinusic]

current svn version of Jifty has problem with schema --setup:

dpavlin at athlon:~/transports-trunk$ ./bin/jifty schema --setup
INFO - Gerating SQL to upgrade Jifty 0.605.0 database to 0.605.40
INFO - Upgrading through 0.60504
INFO - Running upgrade script
Must provide a table to rename at
/usr/local/share/perl/5.8.8/Jifty/Upgrade.pm line 78.

attached diff tries to fix the issue.

-- 
Dobrica Pavlinusic               2share!2flame            dpavlin at rot13.org
Unix addict. Internet consultant.             http://www.rot13.org/~dpavlin
-------------- next part --------------
==== Patch <jifty-upgrade-rename.diff> level 1
Source: [No source]
Target: e84bef0a-9b06-0410-84ba-c4c9edb13aeb:/jifty/trunk:990
        (http://svn.jifty.org/svn/jifty.org)
Log:
fix "Must provide a table to rename" error with schema --setup
=== lib/Jifty/Upgrade.pm
==================================================================
--- lib/Jifty/Upgrade.pm	(revision 990)
+++ lib/Jifty/Upgrade.pm	(patch jifty-upgrade-rename.diff level 1)
@@ -74,8 +74,7 @@
 sub rename {
     my (%args) = @_;
 
-    $args{table} ||= $args{in};
-    die "Must provide a table to rename";
+    $args{table} ||= $args{in} or die "Must provide a table to rename";
 
     Jifty::Util->require($args{table});
     $args{table} = $args{table}->table;

==== BEGIN SVK PATCH BLOCK ====
Version: svk 1.07 (linux)

eJyFkktr3DAUhQdKKfRPVARl6Yxe9oynYLxpFy0tgSTdDrJ8PaPWYxlZnmZAu9BlVvnDleU8uihk
Kd1zvnt1dD/b648l9UVBPKbEX/34utlcSqf25+GEMw+1dsbi1LdwhBZz35odFr6TBwhVJ+0OXFHQ
YF7P5k/R8AQRE6OSznQDziNs6ywApl6UqS+ZL3mwehqKpodua41xoUme01DbThOp1gywnZyTOp3U
DFMxy2ttQYV2p2kwXUXS7OaTO310v8iC4BnD/4PJJ8zyi27cKTZ6BcaeYeLpBY1uATPywlne9Dsr
a7joD7HpK0g+I2NV9n172jq4dTW0TsY2nHkF0KxUBoxmkAMTkmV5tWqEoutVs8oEZiL8xffF4uHd
w9v3bxb3anG3+PPhfo+MLcW/scZhH6kp5YJSmaV5IwjJlOCQAsm5rIRSBNIYbsZ8o2/R2bdxcKi3
5qhrQBI5WbWAnEEWps04Q2Ctsei3dns0qD0cJEqSAdzYY5b6n1MsyTjHksyWi1o3TVEwjxmbF+k6
7tZmc9PpI9hBtueZD5vXS7cPGVo4hsM46hpT5pcRuXR27H7FgAnmYXfXooKGyCSvSJYQQUkSbmSi
hMqhriiXUP0FyzH7jA==
==== END SVK PATCH BLOCK ====