-diff -ur yum-3.2.25.orig/cli.py yum-3.2.25/cli.py
---- yum-3.2.25.orig/cli.py 2010-04-26 18:04:21.012619640 -0400
-+++ yum-3.2.25/cli.py 2010-04-26 18:05:04.141743816 -0400
-@@ -1276,13 +1276,14 @@
- def getRoot(self,opts):
- # If the conf file is inside the installroot - use that.
- # otherwise look for it in the normal root
-+ if opts.conffile is None:
-+ opts.conffile = '/etc/yum/yum.conf'
-+ if opts.installroot:
-+ if os.access(opts.installroot+opts.conffile, os.R_OK):
-+ opts.conffile = opts.installroot+opts.conffile
-+ elif os.access(opts.installroot+'/etc/yum.conf', os.R_OK):
-+ opts.conffile = opts.installroot+'/etc/yum.conf'
- 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 = '/'
-@@ -1323,7 +1324,7 @@
- action="store_true",
- help=_("run entirely from system cache, don't update cache"))
- group.add_option("-c", "--config", dest="conffile",
-- default='/etc/yum/yum.conf',
-+ default=None,
- help=_("config file location"), metavar='[config file]')
- group.add_option("-R", "--randomwait", dest="sleeptime", type='int',
- default=None,
-diff -ur yum-3.2.25.orig/yum/config.py yum-3.2.25/yum/config.py
---- yum-3.2.25.orig/yum/config.py 2010-04-26 18:04:21.232521015 -0400
-+++ yum-3.2.25/yum/config.py 2010-04-26 18:04:45.824994677 -0400
-@@ -602,6 +602,29 @@
- syslog_ident = Option()
- syslog_facility = Option('LOG_DAEMON')
-
-+
-+
-+ def getRootedPath(self, path, enforce_default=False, defaults_to_host=False):
-+ instroot = self.installroot
-+ if instroot is None:
-+ return path
-+
-+ if path.startswith('hostfs://'): res = path[9:]
-+ elif path.startswith('chrootfs://'): res = instroot + '/' + path[11:]
-+ else:
-+ tmp = instroot + '/' + path
-+
-+ if enforce_default:
-+ if defaults_to_host: res = path
-+ else: res = tmp
-+ else:
-+ if os.path.exists(tmp): res = tmp
-+ elif defaults_to_host: res = path
-+ else: res = tmp
-+
-+ return res
-+
-+
- class YumConf(StartupConf):
- '''
- Configuration option definitions for yum.conf\'s [main] section.
-@@ -615,6 +638,7 @@
- persistdir = Option('/var/lib/yum')
- keepcache = BoolOption(True)
- logfile = Option('/var/log/yum.log')
-+ lockfile = Option('/var/run/yum.pid')
- reposdir = ListOption(['/etc/yum/repos.d', '/etc/yum.repos.d'])
-
- commands = ListOption()
-@@ -854,9 +878,9 @@
- yumconf.populate(startupconf._parser, 'main')
-
- # Apply the installroot to directory options
-- for option in ('cachedir', 'logfile', 'persistdir'):
-+ for option in ('cachedir', 'logfile', 'lockfile', 'persistdir'):
- path = getattr(yumconf, option)
-- ir_path = yumconf.installroot + path
-+ ir_path = yumconf.getRootedPath(path)
- ir_path = ir_path.replace('//', '/') # os.path.normpath won't fix this and
- # it annoys me
- ir_path = varReplace(ir_path, yumvars)
-diff -ur yum-3.2.25.orig/yum/config.py.orig yum-3.2.25/yum/config.py.orig
---- yum-3.2.25.orig/yum/config.py.orig 2010-04-26 18:04:21.093414920 -0400
-+++ yum-3.2.25/yum/config.py.orig 2010-04-26 18:04:21.232521015 -0400
-@@ -788,6 +788,7 @@
- sslclientcert = Inherit(YumConf.sslclientcert)
- sslclientkey = Inherit(YumConf.sslclientkey)
-
-+ skip_if_unavailable = BoolOption(False)
-
- class VersionGroupConf(BaseConfig):
- pkglist = ListOption()
-diff -ur yum-3.2.25.orig/yum/__init__.py yum-3.2.25/yum/__init__.py
---- yum-3.2.25.orig/yum/__init__.py 2010-04-26 18:04:21.238799385 -0400
-+++ yum-3.2.25/yum/__init__.py 2010-04-26 18:04:45.828610053 -0400
-@@ -392,8 +392,7 @@
- # this check makes sure that our dirs exist properly.
- # if they aren't in the installroot then don't prepend 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 sorted(glob.glob('%s/*.repo' % reposdir)):
-@@ -1320,9 +1319,8 @@
- return
-
- root = self.conf.installroot
-- lockfile = root + '/' + lockfile # lock in the chroot
-- lockfile = os.path.normpath(lockfile) # get rid of silly preceding extra /
--
-+ lockfile = self.conf.lockfile
-+
- mypid=str(os.getpid())
- while not self._lock(lockfile, mypid, 0644):
- fd = open(lockfile, 'r')
-Only in yum-3.2.25/yum: __init__.py.orig