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

improve style

Browse Source
This commit is contained in:
Ludwig Nussel 2015-08-13 11:09:29 +02:00
parent 8ba3963c95
commit b610d3a03c
1 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
manager_42.py
View File

@ -58,10 +58,12 @@ class UpdateCrawler(object):
'openSUSE:Factory', 'openSUSE:Factory',
] ]
self.subprojects = [ self.subprojects = [
self.from_prj + ':SLE-Pkgs-With-Overwrites', '%s:SLE-Pkgs-With-Overwrites' % self.from_prj,
self.from_prj + ':Factory-Copies', '%s:Factory-Copies' % self.from_prj,
self.from_prj + ':SLE12-Picks', '%s:SLE12-Picks' % self.from_prj,
] ]
self.projects = [self.from_prj] + self.subprojects
self.project_mapping = {} self.project_mapping = {}
for prj in self.project_preference_order: for prj in self.project_preference_order:
if prj.startswith('SUSE:'): if prj.startswith('SUSE:'):
@ -70,7 +72,7 @@ class UpdateCrawler(object):
self.project_mapping[prj] = self.from_prj + ':Factory-Copies' self.project_mapping[prj] = self.from_prj + ':Factory-Copies'
self.packages = dict() self.packages = dict()
for project in [self.from_prj] + self.subprojects: for project in self.projects:
self.packages[project] = self.get_source_packages(project) self.packages[project] = self.get_source_packages(project)
def get_source_packages(self, project, expand=False): def get_source_packages(self, project, expand=False):
@ -293,7 +295,7 @@ class UpdateCrawler(object):
""" walk through projects in order of preference and delete """ walk through projects in order of preference and delete
duplicates in overlayed projects""" duplicates in overlayed projects"""
mypackages = dict() mypackages = dict()
for project in [self.from_prj] + self.subprojects: for project in self.projects:
for package in self.packages[project]: for package in self.packages[project]:
if package in mypackages: if package in mypackages:
# XXX: why was this code here? # XXX: why was this code here?
@ -317,7 +319,7 @@ class UpdateCrawler(object):
exists = False exists = False
if package.get('package').startswith('_product'): if package.get('package').startswith('_product'):
continue continue
for prj in [self.from_prj] + self.subprojects: for prj in self.projects:
if package.get('package') in self.packages[prj]: if package.get('package') in self.packages[prj]:
exists = True exists = True
if exists: if exists:
@ -347,7 +349,7 @@ class UpdateCrawler(object):
files.remove(subpackage) files.remove(subpackage)
for subpackage in files: for subpackage in files:
for prj in [self.from_prj] + self.subprojects: for prj in self.projects:
self.remove_packages(prj, self.packages[prj]) self.remove_packages(prj, self.packages[prj])
link = "<link cicount='copy' package='{}' />".format(mainpackage) link = "<link cicount='copy' package='{}' />".format(mainpackage)
@ -367,7 +369,7 @@ def main(args):
lp = uc.crawl(args.package) lp = uc.crawl(args.package)
uc.try_to_find_left_packages(lp) uc.try_to_find_left_packages(lp)
if not args.skip_sanity_checks: if not args.skip_sanity_checks:
for prj in [uc.from_prj] + uc.subprojects: for prj in uc.projects:
uc.find_invalid_links(prj) uc.find_invalid_links(prj)
uc.freeze_candidates() uc.freeze_candidates()