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

Fix various typos, work around a yum api bug, strip the manifest lines right, log more output

Browse Source
This commit is contained in:
Jesse Keating 2007-03-02 10:24:03 -05:00 committed by Jesse Keating
parent 45a4b62308
commit be44e2527d
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Changelog
View File

@ -1,3 +1,6 @@
* Fri Mar 02 2007 Jesse Keating <jkeating@redhat.com>
- Add kickstart %packages syntax support to package manifest
* Wed Feb 28 2007 Jesse Keating <jkeating@redhat.com>
- Update Fedora 7 comps file.
- Tag for F7 Test2

28
pypungi/gather.py
View File

@ -43,7 +43,8 @@ class Gather(yum.YumBase):
else:
arches = yum.rpmUtils.arch.getArchList(config.get('default', 'arch'))
self.compatarch = config.get('default', 'arch')
self.doSackSetup(arches)
#self.doSackSetup(arches)
self.doSackSetup(archlist=arches) # work around temp break in yum api
self.doSackFilelistPopulate()
self.logger = yum.logging.getLogger("yum.verbose.pungi")
self.pkglist = pkglist
@ -51,8 +52,8 @@ class Gather(yum.YumBase):
self.srpmlist = []
self.resolved_deps = {} # list the deps we've already resolved, short circuit.
# Create a comps object and add our comps file for group definitions
self.comps = yum.comps.comps()
self.comps.add(self.config.get('default', 'comps'))
self.compsobj = yum.comps.Comps()
self.compsobj.add(self.config.get('default', 'comps'))
def doLoggingSetup(self, debuglevel, errorlevel):
"""Setup the logging facility."""
@ -132,7 +133,7 @@ class Gather(yum.YumBase):
return pkgresults.keys()
def getPackagesFromGroup(self, group)
def getPackagesFromGroup(self, group):
"""Get a list of package names from a comps object
Returns a list of package names"""
@ -152,12 +153,12 @@ class Gather(yum.YumBase):
group = group.split(' --nodefaults')[0]
# Check if we have the group
if not self.comps.has_group(group)
if not self.compsobj.has_group(group):
self.logger.error("Group %s not found in comps!" % group)
return packages
# Get the group object to work with
groupobj = self.comps.return_group(group)
groupobj = self.compsobj.return_group(group)
# Add the mandatory packages
packages.extend(groupobj.mandatory_packages.keys())
@ -189,20 +190,29 @@ class Gather(yum.YumBase):
# Cycle through the package list and pull out the groups
for line in self.pkglist:
if line.strip().startswith('#'):
line = line.strip()
if line.startswith('#'):
if not self.config.has_option('default', 'quiet'):
self.logger.info('Skipping comment: %s' % line)
continue
if line.startswith('@'):
if not self.config.has_option('default', 'quiet'):
self.logger.info('Adding group: %s' % line)
grouplist.append(line.strip('@'))
continue
if line.startswith('-'):
if not self.config.has_option('default', 'quiet'):
self.logger.info('Adding exclude: %s' % line)
excludelist.append(line.strip('-'))
continue
else:
if not self.config.has_option('default', 'quiet'):
self.logger.info('Adding package: %s' % line)
addlist.append(line)
# First, get a list of packages from groups
for group in grouplist:
searchlist.extend(getPackagesFromGroup(group))
searchlist.extend(self.getPackagesFromGroup(group))
# Add the adds
searchlist.extend(addlist)
@ -213,7 +223,7 @@ class Gather(yum.YumBase):
searchlist.remove(exclude)
# Search repos for things in our searchlist, supports globs
(exactmatched, matched, unmatched) = yum.packages.parsePackages(self.pkgSack.returnPackages(), self.pkglist, casematch=1)
(exactmatched, matched, unmatched) = yum.packages.parsePackages(self.pkgSack.returnPackages(), searchlist, casematch=1)
matches = exactmatched + matched
# Get the newest results from the search, if not "excluded" (catches things added by globs)