[yum-commits] Branch 'yum-3_2_X' - 2 commits - yum/config.py yumcommands.py

[James Antill]

 yum/config.py  |    3 ++-
 yumcommands.py |    4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit e0cb20ebfd398cf9a5a85e5a21de9b4ee860b861
Author: James Antill <james at and.org>
Date:   Fri May 22 17:02:29 2009 -0400

    Allow users to put config. vars in cachedir/installroot/etc.

diff --git a/yum/config.py b/yum/config.py
index 9a47f1c..fd3ad7b 100644
--- a/yum/config.py
+++ b/yum/config.py
@@ -24,7 +24,7 @@ import warnings
 import rpm
 import copy
 import urlparse
-from parser import ConfigPreProcessor
+from parser import ConfigPreProcessor, varReplace
 from iniparse import INIConfig
 from iniparse.compat import NoSectionError, NoOptionError, ConfigParser
 from iniparse.compat import ParsingError
@@ -803,6 +803,7 @@ def readMainConfig(startupconf):
         ir_path = yumconf.installroot + path
         ir_path = ir_path.replace('//', '/') # os.path.normpath won't fix this and
                                              # it annoys me
+        ir_path = varReplace(ir_path, yumvars)
         setattr(yumconf, option, ir_path)
     
     # Add in some extra attributes which aren't actually configuration values 
commit 8bbb89963214ce2ab787c0e420d695afd9d1a5bb
Author: James Antill <james at and.org>
Date:   Thu May 21 23:14:12 2009 -0400

    Show metalink data for Fedora 11, with the metalink is mirrorlist hack

diff --git a/yumcommands.py b/yumcommands.py
index 0d725e1..6a0e243 100644
--- a/yumcommands.py
+++ b/yumcommands.py
@@ -856,6 +856,10 @@ class RepoListCommand(YumCommand):
                         out += [base.fmtKeyValFill(_("Repo-baseurl: "),
                                                    ", ".join(baseurls))]
 
+                    if enabled:
+                        #  This needs to be here due to the mirrorlists are
+                        # metalinks hack.
+                        repo.urls
                     if repo.metalink:
                         out += [base.fmtKeyValFill(_("Repo-metalink: "),
                                                    repo.metalink)]