yudaike/openSUSE-release-tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Ugly workaround for glibc.i686 package config"

Browse Source 
This reverts commit 5daf2bb6509abaf966268c9d6b13aa4e330a8af3.
This commit is contained in:
Max Lin 2016-04-21 20:09:25 +08:00
parent e593ce11c1
commit 87d4fa5f09
1 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
osclib/checkrepo.py
View File

@ -717,11 +717,6 @@ class CheckRepo(object):
if not filename and not md5_disturl: if not filename and not md5_disturl:
raise ValueError('Please, procide filename or 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)) md5_disturl = md5_disturl if md5_disturl else self._md5_disturl(self._disturl(filename))
vrev_local = self._get_verifymd5(request, md5_disturl) vrev_local = self._get_verifymd5(request, md5_disturl)
@ -797,11 +792,6 @@ class CheckRepo(object):
package): package):
missings.append(package) missings.append(package)
if arch.attrib['result'] not in ('succeeded', 'excluded'): 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 isgood = False
if arch.attrib['result'] == 'disabled': if arch.attrib['result'] == 'disabled':
founddisabled = True founddisabled = True
@ -813,11 +803,6 @@ class CheckRepo(object):
if arch.attrib['result'] == 'building': if arch.attrib['result'] == 'building':
r_foundbuilding = repo_name r_foundbuilding = repo_name
if arch.attrib['result'] == 'outdated': 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 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 print '[DECLINED]', msg
self.change_review_state(request.request_id, 'declined', message=msg) self.change_review_state(request.request_id, 'declined', message=msg)