mirrors/github.com_openSUSE_osc
1
0
Fork 0
mirror of https://github.com/openSUSE/osc.git synced 2024-12-29 03:06:15 +01:00
Code

Merge branch 'fix_queryhdrmd5' of https://github.com/adrianschroeter/osc

Browse Source 
Only verify the hdrmd5 for containers and rpms. Currently, the other formats
(deb and arch) lack a hdrmd5 implementation. For now, we skip the hdrmd5
verification for these formats. The downside is that the build could be
carried out with a "wrong" package (this could happen, for instance, if
a package is replaced with a different package and both packages have the
_same_ canonname).
The old code would abort the build if the buildinfo contains an arch/a deb
bdep with a hdrmd5 attribute - this is also not desirable from a user's
POV...
Eventually, we will implement the hdrmd5 computations for these formats,
too.
This commit is contained in:
Marcus Huewe 2021-10-19 16:20:52 +02:00
commit 16ec3ff9f9
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osc/build.py
View File

@ -1288,6 +1288,8 @@ def main(apiurl, opts, argv):
for i in bi.deps: for i in bi.deps:
if i.hdrmd5: if i.hdrmd5:
if not i.name.startswith('container:') and i.pacsuffix != 'rpm':
continue
from .util import packagequery from .util import packagequery
if i.name.startswith('container:'): if i.name.startswith('container:'):
hdrmd5 = dgst(i.fullfilename) hdrmd5 = dgst(i.fullfilename)

2
osc/fetch.py
View File

@ -217,6 +217,8 @@ class Fetcher:
if os.path.exists(i.fullfilename): if os.path.exists(i.fullfilename):
cached += 1 cached += 1
if not i.name.startswith('container:') and i.pacsuffix != 'rpm':
continue
if i.hdrmd5: if i.hdrmd5:
from .util import packagequery from .util import packagequery
if i.name.startswith('container:'): if i.name.startswith('container:'):