| Index: branches/ariel/xmldumps-backup/incrementals/IncrDumpLib.py |
| — | — | @@ -385,10 +385,16 @@ |
| 386 | 386 | previous = dump |
| 387 | 387 | return previous |
| 388 | 388 | |
| 389 | | - def getLatestIncrDate(self): |
| | 389 | + def getLatestIncrDate(self, ok = False): |
| 390 | 390 | # find the most recent incr dump |
| 391 | 391 | dirs = self.getIncDumpDirs() |
| 392 | 392 | if dirs: |
| 393 | | - return(dirs[-1]) |
| | 393 | + if ok: |
| | 394 | + for dump in dirs: |
| | 395 | + statusInfo = StatusInfo(self._config, dump, self.wikiName) |
| | 396 | + if statusInfo.getStatus(dump) == "done": |
| | 397 | + return dump |
| | 398 | + else: |
| | 399 | + return(dirs[-1]) |
| 394 | 400 | else: |
| 395 | 401 | return(None) |
| Index: branches/ariel/xmldumps-backup/incrementals/incrmonitor.py |
| — | — | @@ -54,7 +54,7 @@ |
| 55 | 55 | if date: |
| 56 | 56 | incrDate = date |
| 57 | 57 | else: |
| 58 | | - incrDate = self.incrDumpsDirs.getLatestIncrDate() |
| | 58 | + incrDate = self.incrDumpsDirs.getLatestIncrDate(True) |
| 59 | 59 | if not incrDate: |
| 60 | 60 | if (self.verbose): |
| 61 | 61 | print "No dump for wiki ", w |