From 87d4fa5f09bbafb400fd9199e5199ce824aa9af3 Mon Sep 17 00:00:00 2001 From: Max Lin Date: Thu, 21 Apr 2016 20:09:25 +0800 Subject: [PATCH] Revert "Ugly workaround for glibc.i686 package config" This reverts commit 5daf2bb6509abaf966268c9d6b13aa4e330a8af3. --- osclib/checkrepo.py | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/osclib/checkrepo.py b/osclib/checkrepo.py index 70083169..f6bd0dfb 100644 --- a/osclib/checkrepo.py +++ b/osclib/checkrepo.py @@ -717,11 +717,6 @@ class CheckRepo(object): if not filename and not md5_disturl: raise ValueError('Please, procide filename or md5_disturl') - # ugly workaround here, glibc.i686 had a topadd block in _link, and looks like - # it causes the disturl won't consistently with glibc even with the same srcmd5 - if request.src_package == 'glibc.i686': - return True - md5_disturl = md5_disturl if md5_disturl else self._md5_disturl(self._disturl(filename)) vrev_local = self._get_verifymd5(request, md5_disturl) @@ -797,11 +792,6 @@ class CheckRepo(object): package): missings.append(package) if arch.attrib['result'] not in ('succeeded', 'excluded'): - # ugly workaround here, glibc.i686 had a topadd block in _link, and looks like - # it causes the disturl won't consistently with glibc even with the same srcmd5. - # and the build state per srcmd5 was outdated also. - if request.src_package == 'glibc.i686': - return True isgood = False if arch.attrib['result'] == 'disabled': founddisabled = True @@ -813,11 +803,6 @@ class CheckRepo(object): if arch.attrib['result'] == 'building': r_foundbuilding = repo_name if arch.attrib['result'] == 'outdated': - # ugly workaround here, glibc.i686 had a topadd block in _link, and looks like - # it causes the disturl won't consistently with glibc even with the same srcmd5. - # and the build state per srcmd5 was outdated also. - if request.src_package == 'glibc.i686': - return True msg = "%s's sources were changed after submission: the relevant binaries are not available (never built or binaries replaced). Please resubmit" % request.src_package print '[DECLINED]', msg self.change_review_state(request.request_id, 'declined', message=msg)