commit: 466efb88ab3d72b90aff8c6235f22d7cee99fe15
Author: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache <DOT> Org>
AuthorDate: Sat Sep 7 06:35:03 2019 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sat Sep 7 06:38:25 2019 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=466efb88
grab_updates: use key for file name sort
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
lib/portage/update.py | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/lib/portage/update.py b/lib/portage/update.py
index 83fc3d2b4..1920d213a 100644
--- a/lib/portage/update.py
+++ b/lib/portage/update.py
@@ -188,10 +188,8 @@ def grab_updates(updpath, prev_mtimes=None):
if len(mylist) == 0:
return []
- # update names are mangled to make them sort properly
- mylist = [myfile[3:]+"-"+myfile[:2] for myfile in mylist]
- mylist.sort()
- mylist = [myfile[5:]+"-"+myfile[:4] for myfile in mylist]
+ # sort by (year, quarter)
+ mylist.sort(key=lambda x: (x[3:], x[:2]))
update_data = []
for myfile in mylist:
