packages: yum/yum-chroot.patch - adjusted for version 3.2.22
amateja
amateja at pld-linux.org
Fri May 8 11:28:03 CEST 2009
Author: amateja Date: Fri May 8 09:28:03 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- adjusted for version 3.2.22
---- Files affected:
packages/yum:
yum-chroot.patch (1.8 -> 1.9)
---- Diffs:
================================================================
Index: packages/yum/yum-chroot.patch
diff -u packages/yum/yum-chroot.patch:1.8 packages/yum/yum-chroot.patch:1.9
--- packages/yum/yum-chroot.patch:1.8 Mon Sep 1 02:17:03 2008
+++ packages/yum/yum-chroot.patch Fri May 8 11:27:57 2009
@@ -1,15 +1,15 @@
--- yum-3.2.4/yum/__init__.py.chroot
+++ yum-3.2.4/yum/__init__.py
@@ -214,8 +214,7 @@ class YumBase(depsolve.Depsolve):
- repo_config_age = self.conf.config_file_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.getRootedPath(reposdir)
if os.path.isdir(reposdir):
- for repofn in glob.glob('%s/*.repo' % reposdir):
+ for repofn in sorted(glob.glob('%s/*.repo' % reposdir)):
@@ -664,8 +663,7 @@ class YumBase(depsolve.Depsolve):
if self.conf.uid != 0:
return
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/yum/yum-chroot.patch?r1=1.8&r2=1.9&f=u
More information about the pld-cvs-commit
mailing list