walkero/cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Revert "Add semver import for sorting ls-lR list (#1735)"

Browse Source 
This reverts commit e61343f213d67c8b56b93e23da85a7eb750a2a8a.
This commit is contained in:
Daniel Marjamäki 2019-03-12 06:25:11 +01:00
parent e61343f213
commit 35bbe5617a
2 changed files with 2 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tools/daca2-download.py
View File

@ -13,8 +13,6 @@ import glob
import os import os
import time import time
import semver
DEBIAN = ('ftp://ftp.se.debian.org/debian/', DEBIAN = ('ftp://ftp.se.debian.org/debian/',
'ftp://ftp.debian.org/debian/') 'ftp://ftp.debian.org/debian/')
@ -33,14 +31,6 @@ def wget(filepath):
return False return False
def latestvername(names):
if len(names) == 1:
return names[0]
names.sort(cmp=semver.cmp, key=lambda x: x[x.index(
'_')+1:x.index('.orig.tar')-x.index('_')+1])
return names[-1]
def getpackages(): def getpackages():
if not wget('ls-lR.gz'): if not wget('ls-lR.gz'):
return [] return []
@ -53,20 +43,17 @@ def getpackages():
path = None path = None
archives = [] archives = []
filename = None filename = None
filenames = []
for line in lines: for line in lines:
line = line.strip() line = line.strip()
if len(line) < 4: if len(line) < 4:
if filename: if filename:
archives.append(path + '/' + latestvername(filenames)) archives.append(path + '/' + filename)
path = None path = None
filename = None filename = None
filenames = []
elif line[:12] == './pool/main/': elif line[:12] == './pool/main/':
path = line[2:-1] path = line[2:-1]
elif path and '.orig.tar.' in line: elif path and '.orig.tar.' in line:
filename = line[1 + line.rfind(' '):] filename = line[1 + line.rfind(' '):]
filenames.append(filename)
for a in archives: for a in archives:
print(a) print(a)

16
tools/daca2-getpackages.py
View File

@ -16,8 +16,6 @@ import os
import datetime import datetime
import time import time
import semver
DEBIAN = ('ftp://ftp.se.debian.org/debian/', DEBIAN = ('ftp://ftp.se.debian.org/debian/',
'ftp://ftp.debian.org/debian/') 'ftp://ftp.debian.org/debian/')
@ -35,14 +33,6 @@ def wget(filepath):
return False return False
def latestvername(names):
if len(names) == 1:
return names[0]
names.sort(cmp=semver.cmp, key=lambda x: x[x.index(
'_')+1:x.index('.orig.tar')-x.index('_')+1])
return names[-1]
def getpackages(): def getpackages():
if not wget('ls-lR.gz'): if not wget('ls-lR.gz'):
return [] return []
@ -89,21 +79,17 @@ def getpackages():
path = None path = None
archives = [] archives = []
filename = None filename = None
filenames = []
for line in lines: for line in lines:
line = line.strip() line = line.strip()
if len(line) < 4: if len(line) < 4:
if filename: if filename:
archives.append(DEBIAN[0] + path + '/' + archives.append(DEBIAN[0] + path + '/' + filename)
latestvername(filenames))
path = None path = None
filename = None filename = None
filenames = []
elif line.startswith('./pool/main/'): elif line.startswith('./pool/main/'):
path = line[2:-1] path = line[2:-1]
elif path and line.endswith(('.orig.tar.gz', '.orig.tar.bz2')): elif path and line.endswith(('.orig.tar.gz', '.orig.tar.bz2')):
filename = line[1 + line.rfind(' '):] filename = line[1 + line.rfind(' '):]
filenames.append(filename)
return archives return archives