Index: trunk/testing/installer/naive_installer.py |
— | — | @@ -55,9 +55,18 @@ |
56 | 56 | raise Naive_Installer_Exception("_setup_schema: While installing, I found a schema.sql and tried to use it, but there was some issue with it.\n",e) |
57 | 57 | |
58 | 58 | def _setup_update(self): |
| 59 | + |
| 60 | + return # XXX This method is a work in progress. I don't want to hold up users, |
| 61 | + # so I'll upload to svn like this |
59 | 62 | if not self.instancedir(): |
60 | 63 | raise Naive_Installer_Exception("_setup_update:Internal Error: Could not determine instancedir") |
61 | | - command=settings.phpcommand+os.path.join(self.instancedir,maintenance,"update.php") |
| 64 | + |
| 65 | + update_script=os.path.join(self.instancedir(),"maintenance","update.php") |
| 66 | + |
| 67 | + if not os.path.exists(update_script): |
| 68 | + raise Naive_Installer_Exception("_setup_update:While installing, could not find update.php at: "+command) |
| 69 | + |
| 70 | + command=settings.phpcommand+" "+update_script |
62 | 71 | rv=os.system(command)>>8 |
63 | 72 | if rv: |
64 | 73 | raise Naive_Installer_Exception("_setup_update:While installing, I tried to run the instance's maintenance/update.php, but some issue occurred.") |