mirror of
https://github.com/openSUSE/osc.git
synced 2024-11-14 00:06:15 +01:00
Merge branch 'fix_queryhdrmd5' of https://github.com/adrianschroeter/osc
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:
commit
16ec3ff9f9
@ -1288,6 +1288,8 @@ def main(apiurl, opts, argv):
|
||||
|
||||
for i in bi.deps:
|
||||
if i.hdrmd5:
|
||||
if not i.name.startswith('container:') and i.pacsuffix != 'rpm':
|
||||
continue
|
||||
from .util import packagequery
|
||||
if i.name.startswith('container:'):
|
||||
hdrmd5 = dgst(i.fullfilename)
|
||||
|
@ -217,6 +217,8 @@ class Fetcher:
|
||||
|
||||
if os.path.exists(i.fullfilename):
|
||||
cached += 1
|
||||
if not i.name.startswith('container:') and i.pacsuffix != 'rpm':
|
||||
continue
|
||||
if i.hdrmd5:
|
||||
from .util import packagequery
|
||||
if i.name.startswith('container:'):
|
||||
|
Loading…
Reference in New Issue
Block a user