[yum-commits] 2 commits - yumdownloader.py

James Antill james at osuosl.org
Fri Jan 16 21:06:01 UTC 2009


 yumdownloader.py |   12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

New commits:
commit dc235e43f25ef804a938e0f468e5d3d0c53fe45f
Author: James Antill <james at and.org>
Date:   Fri Jan 16 16:05:56 2009 -0500

    And group conditionals (until they die!)

diff --git a/yumdownloader.py b/yumdownloader.py
index 6a2f2d8..d8f2880 100755
--- a/yumdownloader.py
+++ b/yumdownloader.py
@@ -142,6 +142,10 @@ class YumDownloader(YumUtilBase):
                         pkgnames.update(grp.default_packages)
                     if 'optional' in self.conf.group_package_types:
                         pkgnames.update(grp.optional_packages)
+                    if self.conf.enable_group_conditionals:
+                        for condreq, cond in grp.conditional_packages.iteritems():
+                            if self.isPackageInstalled(cond):
+                                pkgnames.add(condreq)
 
                 if not pkgnames:
                     self.logger.error('No packages for group %s' % group_string)
commit c97d3eff91916b61c62fece93000f937a20ec303
Author: Jason Parker <jparker at digium.com>
Date:   Fri Jan 16 15:59:12 2009 -0500

    Obey conf.group_package_types in yumdownloader @cmdline syntax

diff --git a/yumdownloader.py b/yumdownloader.py
index 67f5c75..6a2f2d8 100755
--- a/yumdownloader.py
+++ b/yumdownloader.py
@@ -136,7 +136,13 @@ class YumDownloader(YumUtilBase):
                 group_string = pkg[1:]
                 pkgnames = set()
                 for grp in self.comps.return_groups(group_string):
-                    pkgnames.update(grp.packages)
+                    if 'mandatory' in self.conf.group_package_types:
+                        pkgnames.update(grp.mandatory_packages)
+                    if 'default' in self.conf.group_package_types:
+                        pkgnames.update(grp.default_packages)
+                    if 'optional' in self.conf.group_package_types:
+                        pkgnames.update(grp.optional_packages)
+
                 if not pkgnames:
                     self.logger.error('No packages for group %s' % group_string)
                     continue


More information about the Yum-commits mailing list