From faf765b8f47f7f4f43414480828202ba396d8228 Mon Sep 17 00:00:00 2001 From: Ludwig Nussel Date: Thu, 21 May 2015 10:36:12 +0200 Subject: [PATCH] skip -32bit resp -64bit packages --- abichecker/abichecker.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/abichecker/abichecker.py b/abichecker/abichecker.py index e905b7a6..e1ba0888 100755 --- a/abichecker/abichecker.py +++ b/abichecker/abichecker.py @@ -737,6 +737,10 @@ class ABIChecker(ReviewBot.ReviewBot): if h['sourcepackage']: continue 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) if not self.disturl_matches_md5(h['disturl'], srcinfo.srcmd5): raise DistUrlMismatch(h['disturl'], srcinfo.srcmd5) @@ -758,13 +762,7 @@ class ABIChecker(ReviewBot.ReviewBot): liblist = dict() # check whether debug info exists for each lib for pkgname in sorted(lib_packages.keys()): - # 32bit debug packages have special names - if pkgname.endswith('-32bit'): - dpkgname = pkgname[:-len('-32bit')]+'-debuginfo-32bit' - elif pkgname.endswith('-64bit'): - dpkgname = pkgname[:-len('-64bit')]+'-debuginfo-64bit' - else: - dpkgname = pkgname+'-debuginfo' + dpkgname = pkgname+'-debuginfo' if not dpkgname in pkgs: missing_debuginfo.add((prj, pkg, repo, arch, pkgname, None)) continue