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

[skvidal at osuosl.org]

 yum/__init__.py |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 6eff05d75100ba29e37b35b6e651ff607db57b33
Merge: 23b9f38... f53b1e4...
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Tue Jan 25 12:32:31 2011 -0500

    Merge branch 'yum-3_2_X' of ssh://yum.baseurl.org/srv/projects/yum/git/yum into yum-3_2_X
    
    * 'yum-3_2_X' of ssh://yum.baseurl.org/srv/projects/yum/git/yum:
      Fully drop the rpmdb cache if the transaction failed, or was a test.
      Update docs about history packages-list.
      Show error message when pkgs-list is given packages, but doesn't match.

commit 23b9f3855dcc8db217fab9b7ea419f8a400fb696
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Tue Jan 25 12:07:44 2011 -0500

    setup the _repos_persistdir in _getConfig b/c of how
    local repos are setup by repoquery and other tools.
    fixes rh bug: 672588

diff --git a/yum/__init__.py b/yum/__init__.py
index efe6f07..78c71ec 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -349,7 +349,10 @@ class YumBase(depsolve.Depsolve):
 
         # who are we:
         self.conf.uid = os.geteuid()
-        
+        # repos are ver/arch specific so add $basearch/$releasever
+        self.conf._repos_persistdir = os.path.normpath('%s/repos/%s/%s/'
+               % (self.conf.persistdir,  self.yumvar.get('basearch', '$basearch'),
+                  self.yumvar.get('releasever', '$releasever')))        
         self.doFileLogSetup(self.conf.uid, self.conf.logfile)
         self.verbose_logger.debug('Config time: %0.3f' % (time.time() - conf_st))
         self.plugins.run('init')
@@ -418,10 +421,7 @@ class YumBase(depsolve.Depsolve):
             else:
                 thisrepo.repo_config_age = repo_age
                 thisrepo.repofile = repofn
-                # repos are ver/arch specific so add $basearch/$releasever
-                self.conf._repos_persistdir = os.path.normpath('%s/repos/%s/%s/'
-                     % (self.conf.persistdir,  self.yumvar.get('basearch', '$basearch'),
-                        self.yumvar.get('releasever', '$releasever')))
+
                 thisrepo.base_persistdir = self.conf._repos_persistdir