skip -32bit resp -64bit packages

This commit is contained in:
Ludwig Nussel 2015-05-21 10:36:12 +02:00
parent 30c8104499
commit faf765b8f4

View File

@ -737,6 +737,10 @@ class ABIChecker(ReviewBot.ReviewBot):
if h['sourcepackage']: if h['sourcepackage']:
continue continue
pkgname = h['name'] pkgname = h['name']
if pkgname.endswith('-32bit') or pkgname.endswith('-64bit'):
# -32bit and -64bit packages are just repackaged, so
# we skip them and only check the original one.
continue
self.logger.debug(pkgname) self.logger.debug(pkgname)
if not self.disturl_matches_md5(h['disturl'], srcinfo.srcmd5): if not self.disturl_matches_md5(h['disturl'], srcinfo.srcmd5):
raise DistUrlMismatch(h['disturl'], srcinfo.srcmd5) raise DistUrlMismatch(h['disturl'], srcinfo.srcmd5)
@ -758,13 +762,7 @@ class ABIChecker(ReviewBot.ReviewBot):
liblist = dict() liblist = dict()
# check whether debug info exists for each lib # check whether debug info exists for each lib
for pkgname in sorted(lib_packages.keys()): for pkgname in sorted(lib_packages.keys()):
# 32bit debug packages have special names dpkgname = pkgname+'-debuginfo'
if pkgname.endswith('-32bit'):
dpkgname = pkgname[:-len('-32bit')]+'-debuginfo-32bit'
elif pkgname.endswith('-64bit'):
dpkgname = pkgname[:-len('-64bit')]+'-debuginfo-64bit'
else:
dpkgname = pkgname+'-debuginfo'
if not dpkgname in pkgs: if not dpkgname in pkgs:
missing_debuginfo.add((prj, pkg, repo, arch, pkgname, None)) missing_debuginfo.add((prj, pkg, repo, arch, pkgname, None))
continue continue