almalinux/pungi
14
1
Fork 0
Code Issues Pull Requests Releases Activity

pungi: Fix dependency resolution to recurse properly.

Browse Source 
It wasn't properly recusing in the --selfhosting or --fulltree cases
before, leading to potenial broken deps.

Bill

Signed-off-by: Bill Nottingham <notting@redhat.com>
This commit is contained in:
Bill Nottingham 2009-09-15 11:22:03 -04:00 committed by Jesse Keating
parent acdac6a2be
commit f8865c35e2
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/pypungi/__init__.py
View File

@ -255,6 +255,7 @@ class Pungi(pypungi.PungiBase):
reqs = po.requires reqs = po.requires
provs = po.provides provs = po.provides
added = []
for req in reqs: for req in reqs:
if self.resolved_deps.has_key(req): if self.resolved_deps.has_key(req):
@ -275,8 +276,10 @@ class Pungi(pypungi.PungiBase):
for dep in depsack.returnNewestByNameArch(): for dep in depsack.returnNewestByNameArch():
self.ayum.tsInfo.addInstall(dep) self.ayum.tsInfo.addInstall(dep)
self.logger.info('Added %s.%s for %s.%s' % (dep.name, dep.arch, po.name, po.arch)) self.logger.info('Added %s.%s for %s.%s' % (dep.name, dep.arch, po.name, po.arch))
added.append(dep)
self.resolved_deps[req] = None self.resolved_deps[req] = None
for add in added:
self.getPackageDeps(add)
def getPackagesFromGroup(self, group): def getPackagesFromGroup(self, group):
"""Get a list of package names from a ksparser group object """Get a list of package names from a ksparser group object
@ -483,6 +486,7 @@ class Pungi(pypungi.PungiBase):
for txmbr in self.ayum.tsInfo: for txmbr in self.ayum.tsInfo:
if txmbr.po.arch != 'src' and txmbr.po not in self.polist: if txmbr.po.arch != 'src' and txmbr.po not in self.polist:
self.polist.append(txmbr.po) self.polist.append(txmbr.po)
self.getPackageDeps(txmbr.po)
self.srpms_build = list(self.srpmpolist) self.srpms_build = list(self.srpmpolist)
# Now that we've resolved deps, refresh the source rpm list # Now that we've resolved deps, refresh the source rpm list
self.getSRPMList() self.getSRPMList()
@ -508,6 +512,7 @@ class Pungi(pypungi.PungiBase):
for txmbr in self.ayum.tsInfo: for txmbr in self.ayum.tsInfo:
if txmbr.po.arch != 'src' and txmbr.po not in self.polist: if txmbr.po.arch != 'src' and txmbr.po not in self.polist:
self.polist.append(txmbr.po) self.polist.append(txmbr.po)
self.getPackageDeps(po)
self.srpms_fulltree = list(self.srpmpolist) self.srpms_fulltree = list(self.srpmpolist)
# Now that we've resolved deps, refresh the source rpm list # Now that we've resolved deps, refresh the source rpm list
self.getSRPMList() self.getSRPMList()