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

fix repod bugs

Browse source
This commit is contained in:
JerryXiao 2019-09-06 15:48:25 +08:00
parent f93e9cfebf
commit fda13dd539
Signed by: Jerry
GPG key ID: 9D9CE43650FF2BAA
1 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
repod.py
View file

@ -98,7 +98,7 @@ class pushFm:
else returns an error string else returns an error string
''' '''
if [f for f in fnames if not (f.endswith(PKG_SUFFIX) or f.endswith(PKG_SIG_SUFFIX))]: if [f for f in fnames if not (f.endswith(PKG_SUFFIX) or f.endswith(PKG_SIG_SUFFIX))]:
return "file to upload are garbage" return "files to upload are garbage"
filter_sig = lambda fnames:[fname for fname in fnames if not fname.endswith(PKG_SIG_SUFFIX)] filter_sig = lambda fnames:[fname for fname in fnames if not fname.endswith(PKG_SIG_SUFFIX)]
if sorted(filter_sig(fnames)) == sorted(filter_sig(self.fnames)): if sorted(filter_sig(fnames)) == sorted(filter_sig(self.fnames)):
try: try:
@ -122,20 +122,22 @@ class pushFm:
print_exc_plus() print_exc_plus()
return ret return ret
else: else:
# gpg verify success
continue
else:
return f'file missing: pkg {pkg_found} sig {sig_found}'
raise RuntimeError("unexpected error")
else:
# gpg verified for all
try: try:
if update(overwrite=overwrite): if update(overwrite=overwrite):
continue return None
else: else:
raise RuntimeError('update return false') raise RuntimeError('update return false')
except Exception: except Exception:
print_exc_plus() print_exc_plus()
return f'{pkg_found} update error' return f'{pkg_found} update error'
else: raise RuntimeError("unexpected error")
return f'file missing: pkg {pkg_found} sig {sig_found}'
return "unexpected error"
else:
# success
return None
finally: finally:
self.__init__() self.__init__()
else: else: