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

Change findDeps to getPackageDeps, don't use a yum function name

Browse Source 
Don't return a list of lists, just return a list
This commit is contained in:
jkeating@localhost.localdomain 2006-10-16 00:42:43 -04:00 committed by Jesse Keating
parent 7b9ed647a4
commit a05f22a073
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gather/gather.py
View File

@ -29,7 +29,7 @@ class Gather(yum.YumBase):
self.pkglist = pkglist self.pkglist = pkglist
self.polist = [] self.polist = []
def findDeps(self, po): def getPackageDeps(self, po):
"""Return the dependencies for a given package, as well """Return the dependencies for a given package, as well
possible solutions for those dependencies. possible solutions for those dependencies.
@ -40,7 +40,6 @@ class Gather(yum.YumBase):
self.logger.info('Checking deps of %s.%s' % (po.name, po.arch)) self.logger.info('Checking deps of %s.%s' % (po.name, po.arch))
reqs = po.requires; reqs = po.requires;
reqs.sort()
pkgresults = [] pkgresults = []
for req in reqs: for req in reqs:
@ -48,7 +47,7 @@ class Gather(yum.YumBase):
if r.startswith('rpmlib('): if r.startswith('rpmlib('):
continue continue
pkgresults.extend(list(self.whatProvides(r, f, v))) pkgresults.extend(self.whatProvides(r, f, v))
return pkgresults return pkgresults
@ -76,7 +75,7 @@ class Gather(yum.YumBase):
for pkg in unprocessed_pkgs: for pkg in unprocessed_pkgs:
if not pkg in final_pkgobjs: if not pkg in final_pkgobjs:
final_pkgobjs.append(pkg) # Add the pkg to our final list final_pkgobjs.append(pkg) # Add the pkg to our final list
deplist = self.findDeps(pkg) # Get the deps of our package deplist = self.getPackageDeps(pkg) # Get the deps of our package
for dep in deplist: # Cycle through deps, if we don't already have it, add it. for dep in deplist: # Cycle through deps, if we don't already have it, add it.
if not dep in unprocessed_pkgs and not dep in final_pkgobjs: if not dep in unprocessed_pkgs and not dep in final_pkgobjs:
@ -95,6 +94,7 @@ class Gather(yum.YumBase):
downloads = [] downloads = []
for pkg in self.polist: for pkg in self.polist:
downloads.append('%s.%s' % (pkg.name, pkg.arch)) downloads.append('%s.%s' % (pkg.name, pkg.arch))
downloads.sort()
self.logger.info("Download list: %s" % downloads) self.logger.info("Download list: %s" % downloads)
pkgdir = os.path.join(self.opts.destdir, self.opts.arch, 'tree') # Package location within destdir, name subject to change/config pkgdir = os.path.join(self.opts.destdir, self.opts.arch, 'tree') # Package location within destdir, name subject to change/config