Merge pull request #1864 from nilxam/fixing_sp1_compare_pkglist

compare_pkglist: minor improvements
This commit is contained in:
Max Lin 2019-02-13 14:59:47 +08:00 committed by GitHub
commit af2471ef6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -79,8 +79,11 @@ class CompareList(object):
query = {'withlinked': 1} query = {'withlinked': 1}
u = makeurl(self.apiurl, ['source', project, package], query=query) u = makeurl(self.apiurl, ['source', project, package], query=query)
root = ET.parse(http_GET(u)).getroot() root = ET.parse(http_GET(u)).getroot()
linked = root.find('linkinfo') links = root.findall('linkinfo/linked')
return linked for linked in links:
if linked.get('project') == project and linked.get('package').startswith("%s." % package):
return False
return links
def check_diff(self, package, old_prj, new_prj): def check_diff(self, package, old_prj, new_prj):
logging.debug('checking %s ...' % package) logging.debug('checking %s ...' % package)
@ -149,7 +152,7 @@ class CompareList(object):
removed_pkgs_in_target = self.removed_pkglist(dest) removed_pkgs_in_target = self.removed_pkglist(dest)
submit_counter = 0 submit_counter = 0
for pkg in source: for pkg in source:
if pkg.startswith('000') or pkg.startswith('_'): if pkg.startswith('00') or pkg.startswith('_'):
continue continue
if pkg not in target: if pkg not in target: