ArielGlenn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/327575 )
Change subject: fix up checkpoint file sorting
......................................................................
fix up checkpoint file sorting
sorting of file objs was broken in 692f02f21ffa2d36db793b4a5cfaa8f704008ebf
when convertig to use sorted() everywhere
Change-Id: I3e285c01c6f08a15f2b6284506a9550fc6fd8a6b
---
M xmldumps-backup/dumps/fileutils.py
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
ArielGlenn: Looks good to me, approved
jenkins-bot: Verified
diff --git a/xmldumps-backup/dumps/fileutils.py
b/xmldumps-backup/dumps/fileutils.py
index 321d2d5..d9ece53 100644
--- a/xmldumps-backup/dumps/fileutils.py
+++ b/xmldumps-backup/dumps/fileutils.py
@@ -669,7 +669,7 @@
(checkpoint and not fobj.is_checkpoint_file)):
continue
files_matched.append(fobj)
- self.sort_fileobjs(files_matched)
+ files_matched = self.sort_fileobjs(files_matched)
return files_matched
# taken from a comment by user "Toothy" on Ned Batchelder's blog (no
longer on the net)
@@ -679,6 +679,7 @@
convert = lambda text: int(text) if text.isdigit() else text
alphanum_key = lambda key: [convert(c) for c in re.split('([0-9]+)',
key.filename)]
mylist = sorted(mylist, key=alphanum_key)
+ return mylist
def get_checkpt_files(self, date=None, dump_name=None,
file_type=None, file_ext=None, parts=False,
temp=False):
--
To view, visit https://gerrit.wikimedia.org/r/327575
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3e285c01c6f08a15f2b6284506a9550fc6fd8a6b
Gerrit-PatchSet: 1
Gerrit-Project: operations/dumps
Gerrit-Branch: master
Gerrit-Owner: ArielGlenn <ar...@wikimedia.org>
Gerrit-Reviewer: ArielGlenn <ar...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
