[yum-commits] docs/yum.conf.5 yum/config.py yum/yumRepo.py

[zpavlas at osuosl.org]

 docs/yum.conf.5 |   10 +++++-----
 yum/config.py   |    2 +-
 yum/yumRepo.py  |    6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 58c1c53fe75f4ce8c1fc7cfe21116ba65297c3a3
Author: Zdenek Pavlas <zpavlas at redhat.com>
Date:   Tue Aug 13 14:48:49 2013 +0200

    Make mdpolicy=group:small default, add group and pkgtags. BZ 989231
    
    With the "metadata_expire_filter" patch from January Yum invalidates
    the cache much less often than it used to. This has some pretty bad
    consequences when eg users run "yum search" with cache that is few
    days old and groups/pkgtags were not loaded yet.
    
    Loading pkgtags and groups with primary should solve this.
    (done in parallel with primary and should be cheap).

diff --git a/docs/yum.conf.5 b/docs/yum.conf.5
index 5b626b9..4369811 100644
--- a/docs/yum.conf.5
+++ b/docs/yum.conf.5
@@ -600,12 +600,12 @@ always did, however it now does some checking on the index and reverts if
 it classifies it as bad.
 
 `group:primary' - Download the primary metadata with the index. This contains
-most of the package information and so is almost always required anyway. This
-is the default.
+most of the package information and so is almost always required anyway.
 
-`group:small' - With the primary also download the updateinfo metadata, this is
-required for yum-security operations and it also used in the graphical clients.
-This file also tends to be significantly smaller than most others.
+`group:small' - With the primary also download the updateinfo metadata, groups,
+and pkgtags. This is required for yum-security operations and it also used in
+the graphical clients. This file also tends to be significantly smaller than
+most others. This is the default.
 
 `group:main' - With the primary and updateinfo download the filelists metadata
 and the group metadata. The filelists data is required for operations like
diff --git a/yum/config.py b/yum/config.py
index 6fcfb3e..cd3ef2e 100644
--- a/yum/config.py
+++ b/yum/config.py
@@ -818,7 +818,7 @@ class YumConf(StartupConf):
     skip_broken = BoolOption(False)
     #  Note that "instant" is the old behaviour, but group:primary is very
     # similar but better :).
-    mdpolicy = ListOption(['group:primary'])
+    mdpolicy = ListOption(['group:small'])
     mddownloadpolicy = SelectionOption('sqlite', ('sqlite', 'xml'))
     #  ('instant', 'group:all', 'group:main', 'group:small', 'group:primary'))
     multilib_policy = SelectionOption(__main_multilib_policy_default__,
diff --git a/yum/yumRepo.py b/yum/yumRepo.py
index 53c0ab2..970b628 100644
--- a/yum/yumRepo.py
+++ b/yum/yumRepo.py
@@ -1630,9 +1630,9 @@ Insufficient space in download directory %s
     def _mdpolicy2mdtypes(self):
         md_groups = {'instant'       : ['__None__'],
                      'group:primary' : ['primary'],
-                     'group:small'   : ["primary", "updateinfo"],
-                     'group:main'    : ["primary", "group", "filelists",
-                                        "updateinfo", "prestodelta"]}
+                     'group:small'   : ["primary", "updateinfo", "group", "pkgtags"],
+                     'group:main'    : ["primary", "updateinfo", "group", "pkgtags",
+                                        "filelists", "prestodelta"]}
         mdtypes = set()
         if type(self.mdpolicy) in types.StringTypes:
             mdtypes.update(md_groups.get(self.mdpolicy, [self.mdpolicy]))