daca2-packages: improved filter for versions

This commit is contained in:
Daniel Marjamäki 2019-11-03 08:13:06 +01:00
parent dbbea54b74
commit 908cd39572
1 changed files with 8 additions and 3 deletions

View File

@ -90,8 +90,12 @@ def getpackages():
line = line.strip() line = line.strip()
if len(line) < 4: if len(line) < 4:
if filename: if filename:
res1 = re.match(r'(.*)[-.][0-9.]+$', path) res1 = re.match(r'(.*)-[0-9.]+$', path)
res2 = re.match(r'(.*)[-.][0-9.]+$', previous_path) if res1 is None:
res1 = re.match(r'(.*)[-.][0-9.]+$', path)
res2 = re.match(r'(.*)-[0-9.]+$', previous_path)
if res2 is None:
res2 = re.match(r'(.*)[-.][0-9.]+$', previous_path)
if res1 is None or res2 is None or res1.group(1) != res2.group(1): if res1 is None or res2 is None or res1.group(1) != res2.group(1):
archives.append(path + '/' + filename) archives.append(path + '/' + filename)
else: else:
@ -110,4 +114,5 @@ def getpackages():
for p in getpackages(): for p in getpackages():
print(p) print(DEBIAN[0] + p)