mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2024-12-26 09:56:13 +01:00
Code

[python3] fix sorting when using osc se

Browse Source 
osc se did not sort the output anymore. The logic
in the existing results.sort(key=...) was wrong. Now it is using
key=itemgetter(0,1) has two columns and key=itemgetter(0) if there
is only one column.
This commit is contained in:
lethliel 2019-04-16 15:18:04 +02:00
parent 71770555ac
commit d10c9b4cea
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
osc/commandline.py
View File

@ -34,6 +34,8 @@ try:
except ImportError:
from .util.helper import cmp_to_key
from operator import itemgetter
MAN_HEADER = r""".TH %(ucname)s "1" "%(date)s" "%(name)s %(version)s" "User Commands"
.SH NAME
%(name)s \- openSUSE build service command-line tool.
@ -7741,11 +7743,12 @@ Please submit there instead, or use --nodevelproject to force direct submission.
continue
# construct a sorted, flat list
# Sort by first column, follwed by second column if we have two columns, else sort by first.
# results.sort(lambda x, y: ( cmp(x[0], y[0]) or
# (len(x)>1 and len(y)>1 and cmp(x[1], y[1])) ))
results.sort(key=cmp_to_key(compare))
if len(results[0]) > 1:
sorted_results = sorted(results, key=itemgetter(0,1))
else:
sorted_results = sorted(results, key=itemgetter(0))
new = []
for i in results:
for i in sorted_results:
new.extend(i)
results = new
headline = []