[yum-cvs] /yum cli.py,1.262,1.263

[Tim Lauridsen]

Update of /home/groups/yum/cvs//yum
In directory login1.linux.duke.edu:/tmp/cvs-serv20523

Modified Files:
	cli.py 
Log Message:
fixed using an installroot dont work if yum.conf was located in /my/install/root/etc/yum.conf', only if it was located in /my/install/root/etc/yum/yum.conf.

Index: cli.py
===================================================================
RCS file: /home/groups/yum/cvs//yum/cli.py,v
retrieving revision 1.262
retrieving revision 1.263
diff -u -r1.262 -r1.263
--- cli.py	8 Apr 2007 03:55:04 -0000	1.262
+++ cli.py	19 Apr 2007 08:37:02 -0000	1.263
@@ -1161,6 +1161,10 @@
         if opts.installroot:
             if os.access(opts.installroot+'/'+opts.conffile, os.R_OK):
                 opts.conffile = opts.installroot+'/'+opts.conffile
+            elif opts.conffile == '/etc/yum/yum.conf':
+                # check if /installroot/etc/yum.conf exists.
+                if os.access(opts.installroot+'/etc/yum.conf', os.R_OK):
+                    opts.conffile = opts.installroot+'/etc/yum.conf'         
             root=opts.installroot
         else:
             root = '/'