upgrade path woes from alpha6

We tried upgrading an alpha6 server to alpha15 here and we had problems. The first one, which I patched, involved context creation. I *think* I fixed it but it may involve more regressions:

http://git.aegirproject.org/?p=hostmaster.git;a=commitdiff;h=4131d4a3f5b...

The second problem was with the node_access tables being rebuild *before* the updates to the platform and client modules are ran. This makes those modules run SELECT query over tables that haven't been updated to the new schema and fail.

The naive/retarded fix I did was to do:

--- a/modules/hosting/hosting.install
+++ b/modules/hosting/hosting.install
@@ -324,7 +324,7 @@ function hosting_update_6013() {

   install_add_permissions(install_get_rid('anonymous user'), array('access disabled sites'));
   install_add_permissions(install_get_rid('authenticated user'), array('access disabled sites'));
-  node_access_rebuild();
+  //node_access_rebuild();
   return $ret;
 }

Obviously, that won't quite cut it. I am not quite sure why we need to rebuild node_access here: we're just giving access to disabled sites, and that's not a node, is it?

Maybe we can just remove that?

PS: I unfortunately lost the traceback of the error messages...