| Index: trunk/wikiation/installer/extension_installer.py |
| — | — | @@ -57,7 +57,7 @@ |
| 58 | 58 | env={} |
| 59 | 59 | |
| 60 | 60 | env=dict(env) |
| 61 | | - env["EXTENSIONS_SVN"]=settings.extensionsdir |
| | 61 | + env["EXTENSIONS_SVN"]=self.get_extensionsdir() |
| 62 | 62 | env["DATABASE_NAME"]=dbname(self.instance) |
| 63 | 63 | env["IN_INSTANCE"]=self.instance |
| 64 | 64 | |
| Index: trunk/wikiation/installer/installation_system.py |
| — | — | @@ -331,3 +331,12 @@ |
| 332 | 332 | if self.can_exec(installer_name,"uninstall"): |
| 333 | 333 | self.exec_task(installer_name,"uninstall") |
| 334 | 334 | |
| | 335 | + def get_extensionsdir(self): |
| | 336 | + """return the relevant extensionsdir to look in""" |
| | 337 | + extensionsdir=None |
| | 338 | + if self.tag: |
| | 339 | + extensionsdir=settings.tagsdir+"/"+self.tag+"/"+settings.extensionssubdir |
| | 340 | + else: |
| | 341 | + extensionsdir=settings.extensionsdir |
| | 342 | + |
| | 343 | + return extensionsdir |
| Index: trunk/wikiation/installer/download_installer.py |
| — | — | @@ -58,8 +58,13 @@ |
| 59 | 59 | |
| 60 | 60 | def do_download (self, installer_name, destination_dir): |
| 61 | 61 | os.chdir(destination_dir) |
| 62 | | - command="svn checkout '"+\ |
| 63 | | - settings.extensionsdir+"/"+\ |
| | 62 | + |
| | 63 | + r='' |
| | 64 | + if self.revision: |
| | 65 | + r="-r "+str(self.revision) |
| | 66 | + command="svn checkout "+\ |
| | 67 | + r+" '"+\ |
| | 68 | + self.get_extensionsdir()+"/"+\ |
| 64 | 69 | installer_name+"'" |
| 65 | 70 | #print command |
| 66 | 71 | result=os.system(command) |