Pisilinux3/pisi
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix #632.

Browse Source
This commit is contained in:
Barış Metin
2005-10-30 16:22:58 +00:00
parent 766766439b
commit 4a43800b9b
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pisi/version.py
+14 -7
View File
@@ -50,15 +50,22 @@ class VersionItem:
def __init__(self, itemstring): def __init__(self, itemstring):
for keyword in keywords.keys(): # special-case: 1.5p
if itemstring.startswith(keyword): # here "p" comes as a separate itemstring and conflicts with
# keyword "p". But keyword should allways contain an integer prefix.
# So, skipping looking for keywords if the length() is 1 makes the
# trick.
if len(itemstring) > 1:
if self._keyword == "NOKEY": for keyword in keywords.keys():
self._keyword = keyword if itemstring.startswith(keyword):
else:
# longer match is correct if self._keyword == "NOKEY":
if len(keyword) > len(self._keyword):
self._keyword = keyword self._keyword = keyword
else:
# longer match is correct
if len(keyword) > len(self._keyword):
self._keyword = keyword
if self._keyword == "NOKEY": if self._keyword == "NOKEY":
if len(itemstring) == 1 and itemstring in string.ascii_letters: if len(itemstring) == 1 and itemstring in string.ascii_letters: