Miroirs/slpkg
1
0
Fork 0
mirror of https://gitlab.com/dslackw/slpkg.git synced 2025-01-28 19:58:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixed: Wrong MD5 check #49

Browse source
This commit is contained in:
Dimitris Zlatanidis 2015-10-14 21:59:58 +03:00
parent fb5e7e68d6
commit fcd23b32ba
1 changed files with 9 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
slpkg/sbo/greps.py
View file

@ -59,35 +59,16 @@ class SBoGrep(object):
def source(self): def source(self):
"""Grab sources downloads links """Grab sources downloads links
""" """
source, source64, = "", ""
for line in self.SLACKBUILDS_TXT.splitlines(): for line in self.SLACKBUILDS_TXT.splitlines():
if line.startswith(self.line_name): if line.startswith(self.line_name):
sbo_name = line[17:].strip() sbo_name = line[17:].strip()
if (self.meta.arch == "x86_64" and
line.startswith(self.line_down_64)):
if sbo_name == self.name and line[28:].strip():
return line[28:]
if line.startswith(self.line_down): if line.startswith(self.line_down):
if sbo_name == self.name and line[21:].strip(): if sbo_name == self.name and line[21:].strip():
source = line[21:] return line[21:]
if line.startswith(self.line_down_64):
if sbo_name == self.name and line[28:].strip():
source64 = line[28:]
return self._select_source_arch(source, source64)
def _select_source_arch(self, source, source64):
"""Return sources by arch
"""
src = ""
if self.meta.arch == "x86_64":
if source64:
src = source64
else:
src = source
if self.meta.skip_unst in self.answer and source64 in self.unst:
src = source
else:
if source:
src = source
if self.meta.skip_unst in self.answer and source in self.unst:
src = source64
return src
def requires(self): def requires(self):
"""Grab package requirements """Grab package requirements
@ -112,35 +93,16 @@ class SBoGrep(object):
def checksum(self): def checksum(self):
"""Grab checksum string """Grab checksum string
""" """
md5sum, md5sum64, = [], []
for line in self.SLACKBUILDS_TXT.splitlines(): for line in self.SLACKBUILDS_TXT.splitlines():
if line.startswith(self.line_name): if line.startswith(self.line_name):
sbo_name = line[17:].strip() sbo_name = line[17:].strip()
if line.startswith(self.line_md5_64): if (self.meta.arch == "x86_64" and
line.startswith(self.line_md5_64)):
if sbo_name == self.name and line[26:].strip(): if sbo_name == self.name and line[26:].strip():
md5sum64 = line[26:].strip().split() return line[26:].strip().split()
if line.startswith(self.line_md5): if line.startswith(self.line_md5):
if sbo_name == self.name and line[19:].strip(): if sbo_name == self.name and line[19:].strip():
md5sum = line[19:].strip().split() return line[19:].strip().split()
return self._select_md5sum_arch(md5sum, md5sum64)
def _select_md5sum_arch(self, md5sum, md5sum64):
"""Return checksums by arch
"""
md5 = ""
if self.meta.arch == "x86_64":
if md5sum64:
md5 = md5sum64
else:
md5 = md5sum
if self.meta.skip_unst in self.answer:
md5 = md5sum
else:
if md5sum:
md5 = md5sum
if self.meta.skip_unst in self.answer and not md5sum:
md5 = md5sum64
return md5
def description(self): def description(self):
"""Grab package verion """Grab package verion