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

Fix check_source on public cloud images

Browse Source 
The check for bcntsynctag can be very misleading - just because we align
the build counters between 2 packages doesn't make them invalid submission
targets. Better rely on the link check which is already implemented as
fallback

And set a verbose decline reason for this case
This commit is contained in:
Stephan Kulow 2019-10-22 09:26:17 +02:00
parent 24a8cf2b2f
commit 7c1a658f3d
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
check_source.py
View File

@ -83,7 +83,7 @@ class CheckSource(ReviewBot.ReviewBot):
self.review_messages['accepted'] = 'Skipping all checks for meta packages' self.review_messages['accepted'] = 'Skipping all checks for meta packages'
return True return True
elif (kind is not None and kind != 'source'): elif (kind is not None and kind != 'source'):
self.review_messages['accepted'] = 'May not modify a non-source package of type {}'.format(kind) self.review_messages['declined'] = 'May not modify a non-source package of type {}'.format(kind)
return False return False
inair_renamed = target_package != source_package inair_renamed = target_package != source_package

10
osclib/core.py
View File

@ -6,12 +6,7 @@ import re
import socket import socket
from xml.etree import cElementTree as ET from xml.etree import cElementTree as ET
from lxml import etree as ETL from lxml import etree as ETL
from urllib.error import HTTPError
try:
from urllib.error import HTTPError
except ImportError:
#python 2.x
from urllib2 import HTTPError
from osc.core import create_submit_request from osc.core import create_submit_request
from osc.core import get_binarylist from osc.core import get_binarylist
@ -533,9 +528,6 @@ def package_kind(apiurl, project, package):
if root.find('releasename') is not None: if root.find('releasename') is not None:
return 'maintenance_update' return 'maintenance_update'
if root.find('bcntsynctag') is not None:
return 'multispec_subpackage'
# Some multispec subpackages do not have bcntsynctag, so check link. # Some multispec subpackages do not have bcntsynctag, so check link.
link = entity_source_link(apiurl, project, package) link = entity_source_link(apiurl, project, package)
if link is not None and link.get('cicount') == 'copy': if link is not None and link.get('cicount') == 'copy':