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

Merge pull request #2727 from nilxam/respin_prior_to_update

Browse Source 
skippkg-finder: use SLE update prior to GA for Respin
This commit is contained in:
Max Lin 2022-03-03 01:14:52 +08:00 committed by GitHub
commit 8ad4917770
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
skippkg-finder.py
View File

@ -110,7 +110,7 @@ class SkippkgFinder(object):
return True return True
return False return False
def get_packagelist(self, project, by_project=True): def get_packagelist(self, project, sle_pkglist=[], by_project=True):
""" """
Return the list of package's info of a project. Return the list of package's info of a project.
If the latest package is from an incident then returns incident If the latest package is from an incident then returns incident
@ -127,7 +127,7 @@ class SkippkgFinder(object):
orig_project = i.get('originproject') orig_project = i.get('originproject')
is_incidentpkg = False is_incidentpkg = False
# Metapackage should not be selected # Metapackage should not be selected
if pkgname.startswith('000') or\ if pkgname.startswith('00') or\
pkgname.startswith('_') or\ pkgname.startswith('_') or\
pkgname.startswith('patchinfo.') or\ pkgname.startswith('patchinfo.') or\
pkgname.startswith('skelcd-') or\ pkgname.startswith('skelcd-') or\
@ -163,6 +163,9 @@ class SkippkgFinder(object):
else: else:
pkglist[pkgname] = {'Project': orig_project, 'Package': pkgname} pkglist[pkgname] = {'Project': orig_project, 'Package': pkgname}
if sle_pkglist and pkgname in sle_pkglist and not orig_project.startswith('openSUSE'):
pkglist[pkgname] = {'Project': sle_pkglist[pkgname]['Project'], 'Package': sle_pkglist[pkgname]['Package']}
if by_project: if by_project:
for pkg in pkglist.keys(): for pkg in pkglist.keys():
if pkglist[pkg]['Project'].startswith('SUSE:') and self.is_sle_specific(pkg): if pkglist[pkg]['Project'].startswith('SUSE:') and self.is_sle_specific(pkg):
@ -247,8 +250,11 @@ class SkippkgFinder(object):
def crawl(self): def crawl(self):
"""Main method""" """Main method"""
leap_pkglist = self.get_packagelist(self.opensuse_project)
sle_pkglist = self.get_packagelist(self.sle_project, by_project=False) sle_pkglist = self.get_packagelist(self.sle_project, by_project=False)
if self.sle_project.endswith(':Update'):
leap_pkglist = self.get_packagelist(self.opensuse_project, sle_pkglist)
else:
leap_pkglist = self.get_packagelist(self.opensuse_project)
# The selected_binarylist[] includes the latest sourcepackage list # The selected_binarylist[] includes the latest sourcepackage list
# binary RPMs from the latest sources need to be presented in ftp eventually # binary RPMs from the latest sources need to be presented in ftp eventually
selected_binarylist = [] selected_binarylist = []