Get group data from the repos instead of our own comps file.

Update ToDo with status and remove things that don't belong
This commit is contained in:
Jesse Keating 2007-08-24 13:50:05 -04:00 committed by Jesse Keating
parent e1d532cfc0
commit 9c757202c2
3 changed files with 10 additions and 12 deletions

View File

@ -3,6 +3,7 @@
- Move some items to cli flags only (part of moving to pykickstart) - Move some items to cli flags only (part of moving to pykickstart)
- make "product_name" "name" instead. KISS - make "product_name" "name" instead. KISS
- hard set product_path to 'Packages' - hard set product_path to 'Packages'
- Use group metadata from repos instead of our own comps file
* Thu Aug 23 2007 Jesse Keating <jkeating@redhat.com> * Thu Aug 23 2007 Jesse Keating <jkeating@redhat.com>
- Add a source config for the Fedora spin - Add a source config for the Fedora spin

13
ToDo
View File

@ -26,11 +26,15 @@ DONE ^^
DONE ^^ DONE ^^
* Make the following transitions * Make the following transitions
product_name -> name product_name -> name *DONE*
product path == 'Packages/" product path == 'Packages/" *DONE*
get comps data from repos
cachedir == /var/cache/pungi ? cachedir == /var/cache/pungi ?
* Get comps data from repos
Use ayum.comps.<whatever> to get comps information *DONE*
Snag each available comps file, cat them together, use xslt to make clean
Use this mutant comps for creating repodata in the destdirs.
* From pykickstart * From pykickstart
manifest -> %packages manifest -> %packages
yum-repos -> repo yum-repos -> repo
@ -39,7 +43,4 @@ DONE ^^
* Release notes stuff * Release notes stuff
Drop all stuff but GPL, README, GPG keys, potentially README-BURNING-ISOS ? Drop all stuff but GPL, README, GPG keys, potentially README-BURNING-ISOS ?
* fedora-release
Provides: system-release = %{version}-%{release}
* Profit! * Profit!

View File

@ -66,10 +66,6 @@ class Gather(pypungi.PungiBase):
self.srpmlist = [] self.srpmlist = []
self.resolved_deps = {} # list the deps we've already resolved, short circuit. 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.compsobj = yum.comps.Comps()
self.compsobj.add(self.config.get('default', 'comps'))
# Create a yum object to use # Create a yum object to use
self.ayum = PungiYum(config) self.ayum = PungiYum(config)
self.ayum.doConfigSetup(fn=config.get('default', 'yumconf'), debuglevel=6, errorlevel=6, root=os.path.join(self.workdir, 'yumroot')) self.ayum.doConfigSetup(fn=config.get('default', 'yumconf'), debuglevel=6, errorlevel=6, root=os.path.join(self.workdir, 'yumroot'))
@ -169,12 +165,12 @@ class Gather(pypungi.PungiBase):
group = group.split(' --nodefaults')[0] group = group.split(' --nodefaults')[0]
# Check if we have the group # Check if we have the group
if not self.compsobj.has_group(group): if not self.ayum.comps.has_group(group):
self.logger.error("Group %s not found in comps!" % group) self.logger.error("Group %s not found in comps!" % group)
return packages return packages
# Get the group object to work with # Get the group object to work with
groupobj = self.compsobj.return_group(group) groupobj = self.ayum.comps.return_group(group)
# Add the mandatory packages # Add the mandatory packages
packages.extend(groupobj.mandatory_packages.keys()) packages.extend(groupobj.mandatory_packages.keys())