diff -ur yum-3.2.27.orig/cli.py yum-3.2.27/cli.py --- yum-3.2.27.orig/cli.py 2010-03-03 20:09:36.000000000 -0500 +++ yum-3.2.27/cli.py 2010-03-23 16:24:21.313420546 -0400 @@ -1278,13 +1278,15 @@ 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 = '/' @@ -1325,7 +1327,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.27.orig/yum/config.py yum-3.2.27/yum/config.py --- yum-3.2.27.orig/yum/config.py 2010-03-23 16:13:48.022914313 -0400 +++ yum-3.2.27/yum/config.py 2010-03-23 16:26:57.116806313 -0400 @@ -603,7 +603,27 @@ syslog_ident = Option() syslog_facility = Option('LOG_DAEMON') persistdir = Option('/var/lib/yum') - + + 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. @@ -617,6 +637,7 @@ 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() @@ -859,9 +880,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.27.orig/yum/__init__.py yum-3.2.27/yum/__init__.py --- yum-3.2.27.orig/yum/__init__.py 2010-03-18 12:28:57.000000000 -0400 +++ yum-3.2.27/yum/__init__.py 2010-03-23 16:27:43.617623958 -0400 @@ -398,8 +398,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)): @@ -1377,10 +1376,8 @@ if self.conf.uid != 0: 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')