From 148d568b3db38ada9cf0c5085d2c71584d588598 Mon Sep 17 00:00:00 2001 From: Ted Trask Date: Sun, 27 Oct 2013 01:43:30 +0000 Subject: Revert "Change function prototypes to pass self and use self.model instead of functions table" This reverts commit fb00ff8f05dae3c110beceb929ea036e4cd14ae1. Conflicts: provisioning-model.lua Conflict was resolved by removing "mymodule." from function calls that are once again made local --- upgradeprovisioning | 9 --------- 1 file changed, 9 deletions(-) (limited to 'upgradeprovisioning') diff --git a/upgradeprovisioning b/upgradeprovisioning index ada0d4f..a4436eb 100755 --- a/upgradeprovisioning +++ b/upgradeprovisioning @@ -238,15 +238,6 @@ done psql -U postgres -c "INSERT INTO provisioning_params VALUES(default, 'databaseversion', 'text', 'Provisioning Database Version', 'Do not edit or delete!', '1', '999', '', null)" provisioning psql -U postgres -c "UPDATE provisioning_params SET value='1' WHERE name='databaseversion'" provisioning -fi -if [ "$version" -lt "2" ]; then -echo "Upgrading to database version 2" - -# provisioning_params validate field changed the order of the first two Lua parameters -$(pwd)/swapvalidateparams - -psql -U postgres -c "UPDATE provisioning_params SET value='2' WHERE name='databaseversion'" provisioning - fi exit 0 -- cgit v1.2.3