https://www.mediawiki.org/wiki/Special:Code/MediaWiki/104144
Revision: 104144
Author: ariel
Date: 2011-11-24 09:29:16 +0000 (Thu, 24 Nov 2011)
Log Message:
-----------
get latest incr date now has optional check for successful run
Modified Paths:
--------------
branches/ariel/xmldumps-backup/incrementals/IncrDumpLib.py
branches/ariel/xmldumps-backup/incrementals/incrmonitor.py
Modified: branches/ariel/xmldumps-backup/incrementals/IncrDumpLib.py
===================================================================
--- branches/ariel/xmldumps-backup/incrementals/IncrDumpLib.py 2011-11-24
09:01:52 UTC (rev 104143)
+++ branches/ariel/xmldumps-backup/incrementals/IncrDumpLib.py 2011-11-24
09:29:16 UTC (rev 104144)
@@ -385,10 +385,16 @@
previous = dump
return previous
- def getLatestIncrDate(self):
+ def getLatestIncrDate(self, ok = False):
# find the most recent incr dump
dirs = self.getIncDumpDirs()
if dirs:
- return(dirs[-1])
+ if ok:
+ for dump in dirs:
+ statusInfo = StatusInfo(self._config, dump, self.wikiName)
+ if statusInfo.getStatus(dump) == "done":
+ return dump
+ else:
+ return(dirs[-1])
else:
return(None)
Modified: branches/ariel/xmldumps-backup/incrementals/incrmonitor.py
===================================================================
--- branches/ariel/xmldumps-backup/incrementals/incrmonitor.py 2011-11-24
09:01:52 UTC (rev 104143)
+++ branches/ariel/xmldumps-backup/incrementals/incrmonitor.py 2011-11-24
09:29:16 UTC (rev 104144)
@@ -54,7 +54,7 @@
if date:
incrDate = date
else:
- incrDate = self.incrDumpsDirs.getLatestIncrDate()
+ incrDate = self.incrDumpsDirs.getLatestIncrDate(True)
if not incrDate:
if (self.verbose):
print "No dump for wiki ", w
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
