Attachment #113593 for bug #171259




	
	for i in range(0, max(len(list1), len(list2))):
		if len(list1) <= i:
			s1 = ("p","-1")
		else:
			s1 = suffix_regexp.match(list1[i]).groups()
		if len(list2) <= i:
			s2 = ("p","-1")
		else:
			s2 = suffix_regexp.match(list2[i]).groups()
		if s1[0] != s2[0]:

			except ValueError:	r1 = 0
			try:			r2 = int(s2[1])
			except ValueError:	r2 = 0
			if (r1 - r2):
				return r1 - r2
	
	# the suffix part is equal to, so finally check the revision
	if match1.group(10):

Return to bug 171259

Lines 124-134 Link Here

(-)portage_versions.py.orig (-3 / +4 lines)
124		124
125	for i in range(0, max(len(list1), len(list2))):	125	for i in range(0, max(len(list1), len(list2))):
126	if len(list1) <= i:	126	if len(list1) <= i:
127	s1 = ("p","0")	127	s1 = ("p","-1")
128	else:	128	else:
129	s1 = suffix_regexp.match(list1[i]).groups()	129	s1 = suffix_regexp.match(list1[i]).groups()
130	if len(list2) <= i:	130	if len(list2) <= i:
131	s2 = ("p","0")	131	s2 = ("p","-1")
132	else:	132	else:
133	s2 = suffix_regexp.match(list2[i]).groups()	133	s2 = suffix_regexp.match(list2[i]).groups()
134	if s1[0] != s2[0]:	134	if s1[0] != s2[0]:
Lines 140-146 Link Here
140	except ValueError: r1 = 0	140	except ValueError: r1 = 0
141	try: r2 = int(s2[1])	141	try: r2 = int(s2[1])
142	except ValueError: r2 = 0	142	except ValueError: r2 = 0
143	return r1 - r2	143	if (r1 - r2):
		144	return r1 - r2
144		145
145	# the suffix part is equal to, so finally check the revision	146	# the suffix part is equal to, so finally check the revision
146	if match1.group(10):	147	if match1.group(10):