Archlinux-Jerry/buildbot
1
0
Fork 0
mirror of https://github.com/archlinux-jerry/buildbot synced 2024-11-22 21:10:41 +08:00
Code Issues Releases Wiki Activity

repo.py: fix TypeError

Browse source
This commit is contained in:
JerryXiao 2019-04-03 12:39:33 +08:00
parent 3864a17b60
commit ca00ac4ecd
Signed by: Jerry
GPG key ID: 9D9CE43650FF2BAA
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
repo.py
View file

@ -155,7 +155,7 @@ def _update():
if pkg_to_add.name.endswith(PKG_SUFFIX): if pkg_to_add.name.endswith(PKG_SUFFIX):
sigfile = Path(f"{str(pkg_to_add)}.sig") sigfile = Path(f"{str(pkg_to_add)}.sig")
if sigfile.exists(): if sigfile.exists():
arch = get_pkg_details_from_name(pkg_to_add).arch arch = get_pkg_details_from_name(pkg_to_add.name).arch
pkg_nlocation = pkg_to_add.parent / '..' / 'www' / arch / pkg_to_add.name pkg_nlocation = pkg_to_add.parent / '..' / 'www' / arch / pkg_to_add.name
sig_nlocation = Path(f'{str(pkg_nlocation)}.sig') sig_nlocation = Path(f'{str(pkg_nlocation)}.sig')
logger.info(f'Moving {pkg_to_add} to {pkg_nlocation}, {sigfile} to {sig_nlocation}') logger.info(f'Moving {pkg_to_add} to {pkg_nlocation}, {sigfile} to {sig_nlocation}')

1
utils.py
View file

@ -102,6 +102,7 @@ class Pkg:
self.arch = arch self.arch = arch
def get_pkg_details_from_name(name): def get_pkg_details_from_name(name):
assert type(name) is str
if name.endswith(f'pkg.tar.{PKG_COMPRESSION}'): if name.endswith(f'pkg.tar.{PKG_COMPRESSION}'):
m = re.match(r'(.+)-([^-]+)-([^-]+)-([^-]+)\.pkg\.tar\.\w+', name) m = re.match(r'(.+)-([^-]+)-([^-]+)-([^-]+)\.pkg\.tar\.\w+', name)
assert m and m.groups() and len(m.groups()) == 4 assert m and m.groups() and len(m.groups()) == 4