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

[skvidal at osuosl.org]

 yum/__init__.py |    6 ++++++
 1 file changed, 6 insertions(+)

New commits:
commit 7e8d67df3c716470f6eec066075a24d12a2beb2e
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Mon Mar 16 14:20:37 2009 -0400

    revert part of c0c64db26fed2634fd02b3e51c2537bce4f75a7f
    - check to see if the installroot+reposdir is present before using it
    - otherwise don't prepent the installroot

diff --git a/yum/__init__.py b/yum/__init__.py
index cb0795c..af6cae6 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -338,6 +338,12 @@ class YumBase(depsolve.Depsolve):
         self.getReposFromConfigFile(self.conf.config_file_path, repo_config_age)
 
         for reposdir in self.conf.reposdir:
+            # this check makes sure that our dirs exist properly.
+            # if they aren't in the installroot then don't prepent the installroot path
+            # if we don't do this then anaconda likes to not  work.
+            if os.path.exists(self.conf.installroot+'/'+reposdir):
+                reposdir = self.conf.installroot + '/' + reposdir
+
             reposdir = self.conf.installroot + '/' + reposdir
             if os.path.isdir(reposdir):
                 for repofn in sorted(glob.glob('%s/*.repo' % reposdir)):