almalinux/pungi
14
1
Fork 0
Code Issues Pull Requests Releases Activity

ALBS-732: pungi: do not build anything if unsigned packages found #8

Closed
soksanichenko wants to merge 3 commits from ALBS-732 into aln8_separate_sources_module
pull from: ALBS-732
merge into: almalinux:aln8_separate_sources_module
Conversation 0 Commits 3 Files Changed 2 +3 -3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit fa3e4649bc - Show all commits

6
pungi/phases/pkgset/pkgsets.py
View File

@ -974,7 +974,7 @@ class KojiMockPackageSet(PackageSetBase):
with open(rpm_path, 'rb') as fd: with open(rpm_path, 'rb') as fd:
header = ts.hdrFromFdno(fd) header = ts.hdrFromFdno(fd)
signature = header[rpm.RPMTAG_SIGGPG] or header[rpm.RPMTAG_SIGPGP] signature = header[rpm.RPMTAG_SIGGPG] or header[rpm.RPMTAG_SIGPGP]
if not signature: if signature is None:
return False return False
pgp_msg = pgpy.PGPMessage.from_blob(signature) pgp_msg = pgpy.PGPMessage.from_blob(signature)
return any( return any(
@ -985,8 +985,8 @@ class KojiMockPackageSet(PackageSetBase):
def get_package_path(self, queue_item): def get_package_path(self, queue_item):
rpm_info, build_info = queue_item rpm_info, build_info = queue_item
# Check if this RPM is coming from scratch task. In this case, we already # Check if this RPM is coming from scratch task.
# know the path. # In this case, we already know the path.
if "path_from_task" in rpm_info: if "path_from_task" in rpm_info:
return rpm_info["path_from_task"] return rpm_info["path_from_task"]